From 90d3e024e6d666d408c0e70625f6d629f6830ab7 Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Fri, 5 Feb 2010 19:50:42 +0000
Subject: [PATCH]     - MGR: Enable task bar icon on Linux. (Improvements)

    clientgui/
        BOINCBaseFrame.cpp
        BOINCGUIApp.cpp

svn path=/trunk/boinc/; revision=20441
---
 clientgui/BOINCBaseFrame.cpp | 7 -------
 clientgui/BOINCGUIApp.cpp    | 2 --
 clientgui/BOINCGUIApp.h      | 3 ---
 3 files changed, 12 deletions(-)

diff --git a/clientgui/BOINCBaseFrame.cpp b/clientgui/BOINCBaseFrame.cpp
index 8c93102a5e..7b24c0c729 100644
--- a/clientgui/BOINCBaseFrame.cpp
+++ b/clientgui/BOINCBaseFrame.cpp
@@ -306,7 +306,6 @@ void CBOINCBaseFrame::OnClose(wxCloseEvent& event) {
     wxLogTrace(wxT("Function Start/End"), wxT("CBOINCBaseFrame::OnClose - Function Begin"));
 
 
-#ifdef wxHAS_TASK_BAR_ICON
     if (!event.CanVeto() || IsIconized()) {
         wxGetApp().FrameClosed();
         Destroy();
@@ -329,10 +328,6 @@ void CBOINCBaseFrame::OnClose(wxCloseEvent& event) {
 #endif
         Hide();
     }
-#else
-    wxGetApp().FrameClosed();
-    Destroy();
-#endif
 
     wxLogTrace(wxT("Function Start/End"), wxT("CBOINCBaseFrame::OnClose - Function End"));
 }
@@ -373,9 +368,7 @@ void CBOINCBaseFrame::OnExit(wxCommandEvent& WXUNUSED(event)) {
         wxGetApp().DeleteMacSystemMenu();
 #endif
 
-#ifdef wxHAS_TASK_BAR_ICON
         wxGetApp().DeleteTaskBarIcon();
-#endif
 
         CDlgEventLog*   eventLog = wxGetApp().GetEventLog();
         if (eventLog) {
diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp
index 554a7765da..5404ea997b 100644
--- a/clientgui/BOINCGUIApp.cpp
+++ b/clientgui/BOINCGUIApp.cpp
@@ -1127,14 +1127,12 @@ bool CBOINCGUIApp::IsModalDialogDisplayed() {
     return false;
 }
 
-#if defined(__WXMSW__) || defined(__WXMAC__)
 void CBOINCGUIApp::DeleteTaskBarIcon() {
     if (m_pTaskBarIcon) {
         delete m_pTaskBarIcon;
     }
     m_pTaskBarIcon = NULL;
 }
-#endif
 
 #ifdef __WXMAC__
 void CBOINCGUIApp::DeleteMacSystemMenu() {
diff --git a/clientgui/BOINCGUIApp.h b/clientgui/BOINCGUIApp.h
index daaaf5ddf2..0696d64647 100644
--- a/clientgui/BOINCGUIApp.h
+++ b/clientgui/BOINCGUIApp.h
@@ -127,11 +127,8 @@ public:
     wxString            GetDataDirectory()          { return m_strBOINCMGRDataDirectory; }
     wxString            GetArguments()              { return m_strBOINCArguments; }
     CDlgEventLog*       GetEventLog()               { return m_pEventLog; }
-
-#if defined(__WXMSW__) || defined(__WXMAC__)
     CTaskBarIcon*       GetTaskBarIcon()            { return m_pTaskBarIcon; }
     void                DeleteTaskBarIcon();
-#endif
 
     bool                IsAccessibilityEnabled()    { return m_bAccessibilityEnabled; }