deTABbed wxQsort()

[wxWidgets.git] / src / cocoa / taskbar.mm

diff --git a/src/cocoa/taskbar.mm b/src/cocoa/taskbar.mm
index 1a5cd8e5006089e69e9ca2b52372aa430397d99e..78bc7c5747cf70c57e6a0d8d51b82f4abad04ff8 100644 (file)
--- a/src/cocoa/taskbar.mm
+++ b/src/cocoa/taskbar.mm
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "taskbar.h"
-#endif
-
 #include "wx/wxprec.h"
 #ifdef wxHAS_TASK_BAR_ICON
 
@@ -42,6 +38,11 @@
 #include "wx/cocoa/NSApplication.h"
 #include "wx/cocoa/autorelease.h"
 
+// A category for methods that are only present in Panther's SDK
+@interface NSStatusItem(wxNSStatusItemPrePantherCompatibility)
+- (void)popUpStatusItemMenu:(NSMenu *)menu;
+@end
+
 class wxTaskBarIconWindow;
 
 // ============================================================================
@@ -63,7 +64,7 @@ public:
 protected:
     inline wxMenu* CreatePopupMenu()
     {   wxASSERT(m_taskBarIcon);
-        m_taskBarIcon->CreatePopupMenu();
+        return m_taskBarIcon->CreatePopupMenu();
     }
     wxTaskBarIcon *m_taskBarIcon;
     wxTaskBarIconWindow *m_iconWindow;
@@ -215,7 +216,7 @@ wxTaskBarIconDockImpl::wxTaskBarIconDockImpl(wxTaskBarIcon *taskBarIcon)
 :   wxTaskBarIconCocoaImpl(taskBarIcon)
 {
     m_originalDockIcon = nil;
-    wxASSERT_MSG(!sm_dockIcon,"You should never have more than one dock icon!");
+    wxASSERT_MSG(!sm_dockIcon, wxT("You should never have more than one dock icon!"));
     sm_dockIcon = this;
 }