Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 100846 turbo: should get back on system tray after explorer.exe crash

Browse Source 
patch by netdemonz@yahoo.com r=biesi sr=jag


git-svn-id: svn://10.0.0.236/trunk@122404 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
timeless%mac.com
2002-05-31 04:31:27 +00:00
parent 901cf1d5a5
commit 63888ea623
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp
View File

@@ -378,6 +378,7 @@ private:
static void SetupSysTrayIcon();
static void RemoveSysTrayIcon();
static UINT mTrayRestart;
static int mConversations;
enum {
@@ -952,6 +953,9 @@ struct MessageWindow {
return TRUE;
}
}
} else if ((nsNativeAppSupportWin::mTrayRestart) && (msg == nsNativeAppSupportWin::mTrayRestart)) {
//Re-add the icon. The taskbar must have been destroyed and recreated
::Shell_NotifyIcon( NIM_ADD, &nsNativeAppSupportWin::mIconData );
}
return DefWindowProc( msgWindow, msg, wp, lp );
}
@@ -960,6 +964,7 @@ private:
HWND mHandle;
}; // struct MessageWindow
UINT nsNativeAppSupportWin::mTrayRestart = 0;
static char nameBuffer[128] = { 0 };
char *nsNativeAppSupportWin::mAppName = nameBuffer;
@@ -2202,6 +2207,11 @@ nsNativeAppSupportWin::SetupSysTrayIcon() {
}
// Add the tray icon.
/* The tray icon will be removed if explorer restarts. Therefore, we are registering
the following window message so we know when the taskbar is created. Explorer will send
this message when explorer restarts.*/
mTrayRestart = ::RegisterWindowMessage(TEXT("TaskbarCreated"));
::Shell_NotifyIcon( NIM_ADD, &mIconData );
}
@@ -2209,6 +2219,7 @@ nsNativeAppSupportWin::SetupSysTrayIcon() {
void
nsNativeAppSupportWin::RemoveSysTrayIcon() {
// Remove the tray icon.
mTrayRestart = 0;
::Shell_NotifyIcon( NIM_DELETE, &mIconData );
// Delete the menu.
::DestroyMenu( mTrayIconMenu );