From: Robin Dunn <robin@alldunn.com>
Date: Sat, 25 Sep 2004 23:14:11 +0000 (+0000)
Subject: Enable TaskBarIcon for Mac too.  Some cleanup.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b17dd4ceee210d51cb5ff36cf5f135b34cd2ebb6?ds=inline

Enable TaskBarIcon for Mac too.  Some cleanup.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29362 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/wxPython/src/_taskbar.i b/wxPython/src/_taskbar.i
index b5fe68cbd3..a43322bb81 100644
--- a/wxPython/src/_taskbar.i
+++ b/wxPython/src/_taskbar.i
@@ -23,8 +23,8 @@
 
 
 %{
-#ifdef __WXMAC__
-// implement dummy classes and such for wxMac
+#ifndef wxHAS_TASK_BAR_ICON
+// implement dummy classes for platforms that don't have it
 
 class wxTaskBarIcon : public wxEvtHandler
 {
@@ -39,6 +39,11 @@ public:
     wxTaskBarIconEvent(wxEventType, wxTaskBarIcon *)
         { wxPyRaiseNotImplemented(); }
     virtual wxEvent* Clone() const { return NULL; }
+    bool IsOk() const { return false; }
+    bool IsIconInstalled() const { return false; }
+    bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxPyEmptyString) { return false; }
+    bool RemoveIcon() { return false; }
+    bool PopupMenu(wxMenu *menu) { return false; }
 };
 
 enum {
@@ -95,7 +100,7 @@ enum {
 // there will be a problem in this case with it holding a reference to itself
 // (since it depends on the dtor for cleanup.)  Better safe than sorry!
 //
-// Perhaps a better mechanism for wxPython woudl be to turn CreatePopupMenu
+// Perhaps a better mechanism for wxPython would be to turn CreatePopupMenu
 // into an event...
 
 MustHaveApp(wxTaskBarIcon);
@@ -114,7 +119,6 @@ public:
         }
     }
 
-#ifndef __WXMAC__
     bool IsOk() const;
     %pythoncode { def __nonzero__(self): return self.IsOk() }
 
@@ -123,7 +127,6 @@ public:
     bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxPyEmptyString);
     bool RemoveIcon();
     bool PopupMenu(wxMenu *menu);
-#endif
 };