version 0.3.1 release

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@106 1a98c847-1fd6-4fd8-948a-caf3550aa51b
This commit is contained in:
s_nakamoto 2010-07-16 23:12:58 +00:00
parent 0bbc812f48
commit 673a6d15d9

6
ui.cpp
View file

@ -375,6 +375,9 @@ void CMainFrame::OnIconize(wxIconizeEvent& event)
// to get rid of the deprecated warning. Just ignore it. // to get rid of the deprecated warning. Just ignore it.
if (!event.Iconized()) if (!event.Iconized())
fClosedToTray = false; fClosedToTray = false;
#ifdef __WXGTK__
if (mapArgs.count("-minimizetotray")) {
#endif
// The tray icon sometimes disappears on ubuntu karmic // The tray icon sometimes disappears on ubuntu karmic
// Hiding the taskbar button doesn't work cleanly on ubuntu lucid // Hiding the taskbar button doesn't work cleanly on ubuntu lucid
// Reports of CPU peg on 64-bit linux // Reports of CPU peg on 64-bit linux
@ -382,6 +385,9 @@ void CMainFrame::OnIconize(wxIconizeEvent& event)
fClosedToTray = true; fClosedToTray = true;
Show(!fClosedToTray); Show(!fClosedToTray);
ptaskbaricon->Show(fMinimizeToTray || fClosedToTray); ptaskbaricon->Show(fMinimizeToTray || fClosedToTray);
#ifdef __WXGTK__
}
#endif
} }
void CMainFrame::OnMouseEvents(wxMouseEvent& event) void CMainFrame::OnMouseEvents(wxMouseEvent& event)