Blob Blame History Raw
diff -urNr boinc-client_release-7.14-7.14.2-orig/clientgui/AsyncRPC.cpp boinc-client_release-7.14-7.14.2/clientgui/AsyncRPC.cpp
--- boinc-client_release-7.14-7.14.2-orig/clientgui/AsyncRPC.cpp	2018-10-11 02:43:27.000000000 +0200
+++ boinc-client_release-7.14-7.14.2/clientgui/AsyncRPC.cpp	2019-03-06 11:45:04.577383180 +0100
@@ -944,11 +944,13 @@
 
     if (m_bNeedTaskBarRefresh && !m_bWaitingForRPC) {
         m_bNeedTaskBarRefresh = false;
+#ifndef __WXGTK__
         CTaskBarIcon* pTaskbar = wxGetApp().GetTaskBarIcon();
         if (pTaskbar) {
             CTaskbarEvent event(wxEVT_TASKBAR_REFRESH, pTaskbar);
             pTaskbar->ProcessEvent(event);
         }
+#endif
     }
 
     if (current_rpc_request.rpcType == RPC_TYPE_ASYNC_WITH_REFRESH_EVENT_LOG_AFTER) {
diff -urNr boinc-client_release-7.14-7.14.2-orig/clientgui/BOINCGUIApp.cpp boinc-client_release-7.14-7.14.2/clientgui/BOINCGUIApp.cpp
--- boinc-client_release-7.14-7.14.2-orig/clientgui/BOINCGUIApp.cpp	2018-10-11 02:43:27.000000000 +0200
+++ boinc-client_release-7.14-7.14.2/clientgui/BOINCGUIApp.cpp	2019-03-06 11:35:03.024667844 +0100
@@ -84,7 +84,9 @@
     m_pSkinManager = NULL;
     m_pFrame = NULL;
     m_pDocument = NULL;
+#ifndef __WXGTK__
     m_pTaskBarIcon = NULL;
+#endif
     m_pEventLog = NULL;
     m_bEventLogWasActive = false;
     m_bProcessingActivateAppEvent = false;
@@ -426,7 +428,7 @@
         }
     }
 
-
+#ifndef __WXGTK__
     // Initialize the task bar icon
 	m_pTaskBarIcon = new CTaskBarIcon(
         m_pSkinManager->GetAdvanced()->GetApplicationName(), 
@@ -438,6 +440,7 @@
 #endif
     );
     wxASSERT(m_pTaskBarIcon);
+#endif // __WXGTK__
 #ifdef __WXMAC__
     m_pMacDockIcon = new CTaskBarIcon(
         m_pSkinManager->GetAdvanced()->GetApplicationName(), 
@@ -510,11 +513,12 @@
     }
     m_pMacDockIcon = NULL;
 #endif
+#ifndef __WXGTK__
     if (m_pTaskBarIcon) {
         delete m_pTaskBarIcon;
     }
     m_pTaskBarIcon = NULL;
-
+#endif
     if (m_pDocument) {
         m_pDocument->OnExit();
         delete m_pDocument;
@@ -1036,9 +1040,11 @@
     if (m_pFrame) {
 	    m_pFrame->FireReloadSkin();
     }
+#ifndef __WXGTK__
     if (m_pTaskBarIcon) {
 	    m_pTaskBarIcon->FireReloadSkin();
     }
+#endif
 }
 
 
diff -urNr boinc-client_release-7.14-7.14.2-orig/clientgui/BOINCGUIApp.h boinc-client_release-7.14-7.14.2/clientgui/BOINCGUIApp.h
--- boinc-client_release-7.14-7.14.2-orig/clientgui/BOINCGUIApp.h	2018-10-11 02:43:27.000000000 +0200
+++ boinc-client_release-7.14-7.14.2/clientgui/BOINCGUIApp.h	2019-03-06 11:40:31.590515501 +0100
@@ -38,7 +38,9 @@
 class wxLogBOINC;
 class CBOINCBaseFrame;
 class CMainDocument;
+#ifndef __WXGTK__
 class CTaskBarIcon;
+#endif
 class CSkinManager;
 class CDlgEventLog;
 class CRPCFinishedEvent;
@@ -78,7 +80,9 @@
     CSkinManager*       m_pSkinManager;
     CBOINCBaseFrame*    m_pFrame;
     CMainDocument*      m_pDocument;
+#ifndef __WXGTK__
     CTaskBarIcon*       m_pTaskBarIcon;
+#endif
     CDlgEventLog*       m_pEventLog;
     bool                m_bEventLogWasActive;
     bool                m_bProcessingActivateAppEvent;
@@ -133,7 +137,9 @@
     wxString            GetArguments()              { return m_strBOINCArguments; }
     int                 GetClientRPCPortArg()       { return m_iRPCPortArg; }
     CDlgEventLog*       GetEventLog()               { return m_pEventLog; }
+#ifndef __WXGTK__
     CTaskBarIcon*       GetTaskBarIcon()            { return m_pTaskBarIcon; }
+#endif
 
     bool                IsAnotherInstanceRunning()  { return m_pInstanceChecker->IsAnotherRunning(); }
     bool                IsMgrMultipleInstance()     { return m_bMultipleInstancesOK; }
diff -urNr boinc-client_release-7.14-7.14.2-orig/clientgui/MainDocument.cpp boinc-client_release-7.14-7.14.2/clientgui/MainDocument.cpp
--- boinc-client_release-7.14-7.14.2-orig/clientgui/MainDocument.cpp	2018-10-11 02:43:27.000000000 +0200
+++ boinc-client_release-7.14-7.14.2/clientgui/MainDocument.cpp	2019-03-06 11:20:52.122033087 +0100
@@ -912,11 +912,13 @@
     if (!IsConnected()) {
         CFrameEvent event(wxEVT_FRAME_REFRESHVIEW, pFrame);
         pFrame->GetEventHandler()->AddPendingEvent(event);
+#ifndef __WXGTK__
         CTaskBarIcon* pTaskbar = wxGetApp().GetTaskBarIcon();
         if (pTaskbar) {
             CTaskbarEvent event(wxEVT_TASKBAR_REFRESH, pTaskbar);
             pTaskbar->AddPendingEvent(event);
         }
+#endif
         CDlgEventLog* eventLog = wxGetApp().GetEventLog();
         if (eventLog) {
             eventLog->OnRefresh();
@@ -2720,4 +2722,4 @@
 //
 bool autoattach_in_progress() {
     return boinc_file_exists(ACCOUNT_DATA_FILENAME) != 0;
-}
\ Manca newline alla fine del file
+}