X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4092a27504cfac416b0e1888a04ad0715711836d..4ac725a3b3cc829e39c91173aaeb61132d4a231c:/src/cocoa/taskbar.mm diff --git a/src/cocoa/taskbar.mm b/src/cocoa/taskbar.mm index 1a5cd8e500..17147b1fd2 100644 --- a/src/cocoa/taskbar.mm +++ b/src/cocoa/taskbar.mm @@ -42,6 +42,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 +68,7 @@ public: protected: inline wxMenu* CreatePopupMenu() { wxASSERT(m_taskBarIcon); - m_taskBarIcon->CreatePopupMenu(); + return m_taskBarIcon->CreatePopupMenu(); } wxTaskBarIcon *m_taskBarIcon; wxTaskBarIconWindow *m_iconWindow; @@ -215,7 +220,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; }