X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/524c47aa3adf2af11a3069fd5da035a604f08f66..f8d0234d39c66f3d1d7fc2346562cb96c8c7be20:/src/osx/carbon/taskbar.cpp diff --git a/src/osx/carbon/taskbar.cpp b/src/osx/carbon/taskbar.cpp index ffca169573..58dc33c1a6 100644 --- a/src/osx/carbon/taskbar.cpp +++ b/src/osx/carbon/taskbar.cpp @@ -41,7 +41,7 @@ public: wxTaskBarIcon *m_parent; class wxTaskBarIconWindow *m_menuEventWindow; - DECLARE_NO_COPY_CLASS(wxTaskBarIconImpl) + wxDECLARE_NO_COPY_CLASS(wxTaskBarIconImpl); }; //----------------------------------------------------------------------------- @@ -347,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); } @@ -442,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);