[pkg-boinc-commits] r385 - in trunk/boinc: . clientgui debian

[Frank S. Thomas]

Author: fst-guest
Date: 2006-03-23 20:29:56 +0000 (Thu, 23 Mar 2006)
New Revision: 385

Added:
   trunk/boinc/clientgui/
   trunk/boinc/clientgui/BOINCTaskBar.h
Modified:
   trunk/boinc/debian/changelog
Log:
Fixed #358650, the FTBFS with G++ 4.1. Since the fix for this is trivial and
it will hopefully integrated upstream soon, I've not created a patch.


Added: trunk/boinc/clientgui/BOINCTaskBar.h
===================================================================
--- trunk/boinc/clientgui/BOINCTaskBar.h	2006-03-23 10:12:37 UTC (rev 384)
+++ trunk/boinc/clientgui/BOINCTaskBar.h	2006-03-23 20:29:56 UTC (rev 385)
@@ -0,0 +1,101 @@
+// Berkeley Open Infrastructure for Network Computing
+// http://boinc.berkeley.edu
+// Copyright (C) 2005 University of California
+//
+// This is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation;
+// either version 2.1 of the License, or (at your option) any later version.
+//
+// This software is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Lesser General Public License for more details.
+//
+// To view the GNU Lesser General Public License visit
+// http://www.gnu.org/copyleft/lesser.html
+// or write to the Free Software Foundation, Inc.,
+// 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+#ifndef _BOINCTASKBAR_H_
+#define _BOINCTASKBAR_H_
+
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "BOINCTaskBar.cpp"
+#endif
+
+#ifdef __APPLE__
+#include <Carbon/Carbon.h>
+#endif
+
+#ifdef __WXMSW__
+#include "msw/taskbarex.h"
+#else
+#define wxTaskBarIconEx     wxTaskBarIcon
+#endif
+
+
+class CTaskBarIcon : public wxTaskBarIconEx {
+    DECLARE_DYNAMIC_CLASS(CTaskBarIcon)
+
+public:
+    CTaskBarIcon();
+    ~CTaskBarIcon();
+
+    void OnOpen(wxCommandEvent& event);
+    void OnActivitySelection(wxCommandEvent& event);
+    void OnNetworkSelection(wxCommandEvent& event);
+    void OnAbout(wxCommandEvent& event);
+    void OnExit(wxCommandEvent& event);
+#ifdef __WXMSW__
+    void OnShutdown(wxTaskBarIconExEvent& event);
+#endif
+
+    void OnIdle(wxIdleEvent& event);
+    void OnClose(wxCloseEvent& event);
+
+#ifdef __WXMSW__
+    void OnMouseMove(wxTaskBarIconEvent& event);
+#endif
+    void OnLButtonDClick(wxTaskBarIconEvent& event);
+
+#ifdef __WXMSW__
+    void OnContextMenu(wxTaskBarIconExEvent& event);
+#else
+    void OnContextMenu(wxTaskBarIconEvent& event);
+#endif
+
+    void OnRButtonDown(wxTaskBarIconEvent& event);
+    void OnRButtonUp(wxTaskBarIconEvent& event);
+
+    wxMenu *BuildContextMenu();
+    void AdjustMenuItems(wxMenu* menu);
+
+#ifdef __APPLE__
+    wxMenu *CreatePopupMenu();
+#endif
+
+#ifndef __WXMSW__
+    inline bool IsBalloonsSupported() {
+        return false;
+    }
+#endif
+
+    wxIcon     m_iconTaskBarIcon;
+
+private:
+    wxDateTime m_dtLastHoverDetected;
+    wxDateTime m_dtLastBalloonDisplayed;
+
+    bool       m_bButtonPressed;
+
+    void       ResetTaskBar();
+    void       CreateContextMenu();
+    
+    DECLARE_EVENT_TABLE()
+
+};
+
+
+#endif
+

Modified: trunk/boinc/debian/changelog
===================================================================
--- trunk/boinc/debian/changelog	2006-03-23 10:12:37 UTC (rev 384)
+++ trunk/boinc/debian/changelog	2006-03-23 20:29:56 UTC (rev 385)
@@ -15,8 +15,9 @@
       non-Linux hosts.
     - Modified 03_wx2.6-with-unicode.dpatch to fix Alioth bug #303021.
       Thanks to Steven Altermatt for the bug report.
+  * Fixed FTBFS with G++ 4.1, thanks to Martin Michlmayr. (closes: 358650)
 
- -- Frank S. Thomas <frank at thomas-alfeld.de>  Wed, 22 Mar 2006 18:14:39 +0100
+ -- Frank S. Thomas <frank at thomas-alfeld.de>  Thu, 23 Mar 2006 21:26:01 +0100
 
 boinc (5.2.15-2) unstable; urgency=low