From 057c51b5d387bc95b51200a3f26e3b82d3adc09e Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Fri, 5 Feb 2010 19:36:59 +0000
Subject: [PATCH]     - MGR: Enable task bar icon on Linux.

    clientgui/
        BOINCBaseFrame.cpp
        BOINCGUIApp.cpp

svn path=/trunk/boinc/; revision=20440
---
 checkin_notes                | 7 +++++++
 clientgui/BOINCBaseFrame.cpp | 5 ++---
 clientgui/BOINCGUIApp.cpp    | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 0ce6a9fb34..6ea07c4364 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -932,3 +932,10 @@ Rom    5 Feb 2010
     
     clientscr/
         boinc_ss.rc
+
+Rom    5 Feb 2010
+    - MGR: Enable task bar icon on Linux.
+    
+    clientgui/
+        BOINCBaseFrame.cpp
+        BOINCGUIApp.cpp
diff --git a/clientgui/BOINCBaseFrame.cpp b/clientgui/BOINCBaseFrame.cpp
index 2dcec87483..8c93102a5e 100644
--- a/clientgui/BOINCBaseFrame.cpp
+++ b/clientgui/BOINCBaseFrame.cpp
@@ -306,7 +306,7 @@ void CBOINCBaseFrame::OnClose(wxCloseEvent& event) {
     wxLogTrace(wxT("Function Start/End"), wxT("CBOINCBaseFrame::OnClose - Function Begin"));
 
 
-#if defined(__WXMSW__) || defined(__WXMAC__)
+#ifdef wxHAS_TASK_BAR_ICON
     if (!event.CanVeto() || IsIconized()) {
         wxGetApp().FrameClosed();
         Destroy();
@@ -373,8 +373,7 @@ void CBOINCBaseFrame::OnExit(wxCommandEvent& WXUNUSED(event)) {
         wxGetApp().DeleteMacSystemMenu();
 #endif
 
-        // TaskBarIcon isn't used in Linux
-#if defined(__WXMSW__) || defined(__WXMAC__)
+#ifdef wxHAS_TASK_BAR_ICON
         wxGetApp().DeleteTaskBarIcon();
 #endif
 
diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp
index 09c32118e4..554a7765da 100644
--- a/clientgui/BOINCGUIApp.cpp
+++ b/clientgui/BOINCGUIApp.cpp
@@ -410,7 +410,7 @@ bool CBOINCGUIApp::OnInit() {
 #endif
 
     // Initialize the task bar icon
-#if defined(__WXMSW__) || defined(__WXMAC__)
+#ifdef wxHAS_TASK_BAR_ICON
 	m_pTaskBarIcon = new CTaskBarIcon(
         m_pSkinManager->GetAdvanced()->GetApplicationName(), 
         m_pSkinManager->GetAdvanced()->GetApplicationIcon(),