renamed Render's argument to not obfuscate its meaning

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

diff --git a/src/cocoa/taskbar.mm b/src/cocoa/taskbar.mm
index 1a5cd8e5006089e69e9ca2b52372aa430397d99e..17147b1fd28b236a82706265dd6da54516bc5726 100644 (file)
--- a/src/cocoa/taskbar.mm
+++ b/src/cocoa/taskbar.mm
@@ -42,6 +42,11 @@
 #include "wx/cocoa/NSApplication.h"
 #include "wx/cocoa/autorelease.h"
 
 #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;
 
 // ============================================================================
 class wxTaskBarIconWindow;
 
 // ============================================================================


@@ -63,7 +68,7 @@ public:
 protected:
     inline wxMenu* CreatePopupMenu()
     {   wxASSERT(m_taskBarIcon);
 protected:
     inline wxMenu* CreatePopupMenu()
     {   wxASSERT(m_taskBarIcon);

-        m_taskBarIcon->CreatePopupMenu();
+        return m_taskBarIcon->CreatePopupMenu();

     }
     wxTaskBarIcon *m_taskBarIcon;
     wxTaskBarIconWindow *m_iconWindow;
     }
     wxTaskBarIcon *m_taskBarIcon;
     wxTaskBarIconWindow *m_iconWindow;


@@ -215,7 +220,7 @@ wxTaskBarIconDockImpl::wxTaskBarIconDockImpl(wxTaskBarIcon *taskBarIcon)
 :   wxTaskBarIconCocoaImpl(taskBarIcon)
 {
     m_originalDockIcon = nil;
 :   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;
 }
 
     sm_dockIcon = this;
 }