Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-05 13:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for buf 90823 - Relaunching or clicking Dock icon should display last minimized window or create new window

Browse Source
This commit is contained in:
lordpixel%mac.com 2002-09-26 03:32:53 +00:00
parent e038422916
commit 01b36da72a
1 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
xpfe/bootstrap/appleevents/nsAEApplicationClass.cpp
View File

@ -48,7 +48,15 @@
#include "nsAEApplicationClass.h"
#include "nsINativeAppSupport.h"
#include "nsCommandLineServiceMac.h"
#include "nsICmdLineService.h"
#include "nsCOMPtr.h"
#include "nsAppShellCIDs.h"
#include "nsIAppShellService.h"
static NS_DEFINE_CID(kCmdLineServiceCID, NS_COMMANDLINE_SERVICE_CID);
static NS_DEFINE_CID(kAppShellServiceCID, NS_APPSHELL_SERVICE_CID);
/*----------------------------------------------------------------------------
AEApplicationClass
@ -311,6 +319,32 @@ void AEApplicationClass::HandleRun(AEDesc *token, const AppleEvent *appleEvent,
ThrowIfOSErr(err);
}
/*----------------------------------------------------------------------------
HandleReOpen
----------------------------------------------------------------------------*/
void AEApplicationClass::HandleReOpen(AEDesc *token, const AppleEvent *appleEvent, AppleEvent *reply)
{
OSErr err = noErr;
nsresult rv = NS_OK;
nsCOMPtr<nsINativeAppSupport> nas;
nsCOMPtr<nsIAppShellService> appShell(do_GetService(kAppShellServiceCID, &rv));
NS_WARN_IF_FALSE(rv==NS_OK, "Failed to get AppShellService");
if(NS_FAILED(rv)) ThrowIfOSErr(errAEEventNotHandled);
rv = appShell->GetNativeAppSupport(getter_AddRefs(nas));
NS_WARN_IF_FALSE(rv==NS_OK, "Failed to get NativeAppSupport");
if(NS_FAILED(rv)) ThrowIfOSErr(errAEEventNotHandled);
rv = nas->ReOpen();
if(NS_FAILED(rv)) ThrowIfOSErr(errAEEventNotHandled);
err = CheckForUnusedParameters(appleEvent);
ThrowIfOSErr(err);
}
/*----------------------------------------------------------------------------
HandleOpen
@ -356,7 +390,7 @@ void AEApplicationClass::HandleOpen(AEDesc *token, const AppleEvent *appleEvent,
----------------------------------------------------------------------------*/
void AEApplicationClass::HandlePrint(AEDesc *token, const AppleEvent *appleEvent, AppleEvent *reply)
{
OSErr err;
OSErr err=noErr;
err = CheckForUnusedParameters(appleEvent);
ThrowIfOSErr(err);
@ -894,4 +928,3 @@ long AEApplicationClass::CountApplicationObjects(const AEDesc *token, DescType d
ThrowIfOSErr(err);
return numberOfObjects;
}