X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/489468feaa08b8f504735eecca522fb8d0f825d2..f8d0234d39c66f3d1d7fc2346562cb96c8c7be20:/src/osx/carbon/taskbar.cpp diff --git a/src/osx/carbon/taskbar.cpp b/src/osx/carbon/taskbar.cpp index 9bb02f5124..58dc33c1a6 100644 --- a/src/osx/carbon/taskbar.cpp +++ b/src/osx/carbon/taskbar.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: src/mac/carbon/taskbar.cpp +// Name: src/osx/carbon/taskbar.cpp // Purpose: wxTaskBarIcon // Author: Ryan Norton // Modified by: @@ -22,7 +22,7 @@ #include "wx/icon.h" #endif -#include "wx/mac/private.h" +#include "wx/osx/private.h" class wxTaskBarIconImpl { @@ -41,7 +41,7 @@ public: wxTaskBarIcon *m_parent; class wxTaskBarIconWindow *m_menuEventWindow; - DECLARE_NO_COPY_CLASS(wxTaskBarIconImpl) + wxDECLARE_NO_COPY_CLASS(wxTaskBarIconImpl); }; //----------------------------------------------------------------------------- @@ -186,9 +186,15 @@ wxDockEventHandler(EventHandlerCallRef WXUNUSED(inHandlerCallRef), if (item && itemMenu ) { if ( eventKind == kEventCommandProcess ) - err = itemMenu->MacHandleCommandProcess( item, id ); + { + if ( itemMenu->HandleCommandProcess( item ) ) + err = noErr; + } else if ( eventKind == kEventCommandUpdateStatus ) - err = itemMenu->MacHandleCommandUpdateStatus( item, id ); + { + if ( itemMenu->HandleCommandUpdateStatus( item ) ) + err = noErr; + } } } } @@ -341,8 +347,7 @@ wxMenu * wxDockTaskBarIcon::DoCreatePopupMenu() if (theNewMenu) { - if (m_pMenu) - delete m_pMenu; + delete m_pMenu; m_pMenu = theNewMenu; m_pMenu->SetInvokingWindow(m_menuEventWindow); } @@ -436,8 +441,7 @@ bool wxDockTaskBarIcon::PopupMenu(wxMenu *menu) { wxASSERT(menu != NULL); - if (m_pMenu) - delete m_pMenu; + delete m_pMenu; // start copy of menu m_pMenu = wxDeepCopyMenu(menu);