|
|
|
@ -375,13 +375,13 @@ void CMainFrame::OnIconize(wxIconizeEvent& event)
@@ -375,13 +375,13 @@ void CMainFrame::OnIconize(wxIconizeEvent& event)
|
|
|
|
|
// to get rid of the deprecated warning. Just ignore it.
|
|
|
|
|
if (!event.Iconized()) |
|
|
|
|
fClosedToTray = false; |
|
|
|
|
#ifdef __WXMSW__ |
|
|
|
|
//#ifdef __WXMSW__
|
|
|
|
|
// The tray icon sometimes disappears on ubuntu karmic
|
|
|
|
|
// Hiding the taskbar button doesn't work reliably on ubuntu lucid
|
|
|
|
|
// Hiding the taskbar button doesn't work cleanly on ubuntu lucid
|
|
|
|
|
if (fMinimizeToTray && event.Iconized()) |
|
|
|
|
fClosedToTray = true; |
|
|
|
|
Show(!fClosedToTray); |
|
|
|
|
#endif |
|
|
|
|
//#endif
|
|
|
|
|
ptaskbaricon->Show(fMinimizeToTray || fClosedToTray); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -2437,7 +2437,7 @@ void CMyTaskBarIcon::Show(bool fShow)
@@ -2437,7 +2437,7 @@ void CMyTaskBarIcon::Show(bool fShow)
|
|
|
|
|
{ |
|
|
|
|
strlcpy(pszPrevTip, strTooltip.c_str(), sizeof(pszPrevTip)); |
|
|
|
|
#ifdef __WXMSW__ |
|
|
|
|
// somehow it'll choose the wrong icon and scale it down if
|
|
|
|
|
// somehow it'll choose the wrong size and scale it down if
|
|
|
|
|
// we use the main icon, so we hand it one with only 16x16
|
|
|
|
|
SetIcon(wxICON(favicon), strTooltip); |
|
|
|
|
#else |
|
|
|
|