X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b59cd6c4331d28debd757ed71062d0b544d3bf7e..8a31648287be0ef976f133de2786b137f1e98340:/src/osx/cocoa/taskbar.mm diff --git a/src/osx/cocoa/taskbar.mm b/src/osx/cocoa/taskbar.mm index 0938f3efb5..9b0d796a5b 100644 --- a/src/osx/cocoa/taskbar.mm +++ b/src/osx/cocoa/taskbar.mm @@ -4,7 +4,7 @@ // Author: David Elliott, Stefan Csomor // Modified by: // Created: 2004/01/24 -// RCS-ID: $Id: taskbar.mm 35650 2005-09-23 12:56:45Z MR $ +// RCS-ID: $Id$ // Copyright: (c) 2004 David Elliott, Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////// @@ -13,6 +13,7 @@ #if wxUSE_TASKBARICON #ifndef WX_PRECOMP + #include "wx/toplevel.h" #include "wx/menu.h" #include "wx/icon.h" #include "wx/log.h" @@ -61,7 +62,7 @@ public: virtual bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxEmptyString) = 0; virtual bool RemoveIcon() = 0; - bool IsIconInstalled() const { return m_icon.Ok(); } + bool IsIconInstalled() const { return m_icon.IsOk(); } virtual bool PopupMenu(wxMenu *menu) = 0; virtual ~wxTaskBarIconImpl(); @@ -290,6 +291,8 @@ bool wxTaskBarIconDockImpl::PopupMenu(wxMenu *WXUNUSED(menu)) @implementation wxNSAppController(wxTaskBarIconNSApplicationDelegateCategory) - (NSMenu*)applicationDockMenu:(NSApplication *)sender { + wxUnusedVar(sender); + return wxTaskBarIconDockImpl::OSXGetDockHMenu(); } @end @@ -302,6 +305,7 @@ bool wxTaskBarIconDockImpl::PopupMenu(wxMenu *WXUNUSED(menu)) - (void) clickedAction: (id) sender { + wxUnusedVar(sender); wxMenu *menu = impl->CreatePopupMenu(); if (menu) {