Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

- MGR: Enable task bar icon on Linux. (Improvements) 

clientgui/
        BOINCBaseFrame.cpp
        BOINCGUIApp.cpp

svn path=/trunk/boinc/; revision=20441
This commit is contained in:
Rom Walton 2010-02-05 19:50:42 +00:00
parent 057c51b5d3
commit 90d3e024e6
3 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clientgui/BOINCBaseFrame.cpp
View File

@ -306,7 +306,6 @@ void CBOINCBaseFrame::OnClose(wxCloseEvent& event) {
wxLogTrace(wxT("Function Start/End"), wxT("CBOINCBaseFrame::OnClose - Function Begin")); wxLogTrace(wxT("Function Start/End"), wxT("CBOINCBaseFrame::OnClose - Function Begin"));
#ifdef wxHAS_TASK_BAR_ICON
if (!event.CanVeto() || IsIconized()) { if (!event.CanVeto() || IsIconized()) {
wxGetApp().FrameClosed(); wxGetApp().FrameClosed();
Destroy(); Destroy();
@ -329,10 +328,6 @@ void CBOINCBaseFrame::OnClose(wxCloseEvent& event) {
#endif #endif
Hide(); Hide();
} }
#else
wxGetApp().FrameClosed();
Destroy();
#endif
wxLogTrace(wxT("Function Start/End"), wxT("CBOINCBaseFrame::OnClose - Function End")); wxLogTrace(wxT("Function Start/End"), wxT("CBOINCBaseFrame::OnClose - Function End"));
} }
@ -373,9 +368,7 @@ void CBOINCBaseFrame::OnExit(wxCommandEvent& WXUNUSED(event)) {
wxGetApp().DeleteMacSystemMenu(); wxGetApp().DeleteMacSystemMenu();
#endif #endif
#ifdef wxHAS_TASK_BAR_ICON
wxGetApp().DeleteTaskBarIcon(); wxGetApp().DeleteTaskBarIcon();
#endif
CDlgEventLog* eventLog = wxGetApp().GetEventLog(); CDlgEventLog* eventLog = wxGetApp().GetEventLog();
if (eventLog) { if (eventLog) {

2
clientgui/BOINCGUIApp.cpp
View File

@ -1127,14 +1127,12 @@ bool CBOINCGUIApp::IsModalDialogDisplayed() {
return false; return false;
} }
#if defined(__WXMSW__) || defined(__WXMAC__)
void CBOINCGUIApp::DeleteTaskBarIcon() { void CBOINCGUIApp::DeleteTaskBarIcon() {
if (m_pTaskBarIcon) { if (m_pTaskBarIcon) {
delete m_pTaskBarIcon; delete m_pTaskBarIcon;
} }
m_pTaskBarIcon = NULL; m_pTaskBarIcon = NULL;
} }
#endif
#ifdef __WXMAC__ #ifdef __WXMAC__
void CBOINCGUIApp::DeleteMacSystemMenu() { void CBOINCGUIApp::DeleteMacSystemMenu() {

3
clientgui/BOINCGUIApp.h
View File

@ -127,11 +127,8 @@ public:
wxString GetDataDirectory() { return m_strBOINCMGRDataDirectory; } wxString GetDataDirectory() { return m_strBOINCMGRDataDirectory; }
wxString GetArguments() { return m_strBOINCArguments; } wxString GetArguments() { return m_strBOINCArguments; }
CDlgEventLog* GetEventLog() { return m_pEventLog; } CDlgEventLog* GetEventLog() { return m_pEventLog; }
#if defined(__WXMSW__) || defined(__WXMAC__)
CTaskBarIcon* GetTaskBarIcon() { return m_pTaskBarIcon; } CTaskBarIcon* GetTaskBarIcon() { return m_pTaskBarIcon; }
void DeleteTaskBarIcon(); void DeleteTaskBarIcon();
#endif
bool IsAccessibilityEnabled() { return m_bAccessibilityEnabled; } bool IsAccessibilityEnabled() { return m_bAccessibilityEnabled; }