From c5161f6296aa80ff46a42558b68fc952390c45dc Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 14 Aug 2020 19:43:00 +0200 Subject: [PATCH] Get rid of an unnecessary local variable No real changes, just simplify the code a bit more. --- src/osx/cocoa/taskbar.mm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/osx/cocoa/taskbar.mm b/src/osx/cocoa/taskbar.mm index c9a56bab90..14c80efb51 100644 --- a/src/osx/cocoa/taskbar.mm +++ b/src/osx/cocoa/taskbar.mm @@ -252,25 +252,23 @@ WX_NSMenu wxTaskBarIconDockImpl::OSXDoGetDockHMenu() { m_menuDeleter.reset(); - wxMenu *dockMenu = GetPopupMenu(); + m_pMenu = GetPopupMenu(); - if(!dockMenu) + if (!m_pMenu) { - dockMenu = CreatePopupMenu(); + m_pMenu = CreatePopupMenu(); - if(!dockMenu) + if (!m_pMenu) return nil; - m_menuDeleter.reset(dockMenu); + m_menuDeleter.reset(m_pMenu); } - m_pMenu = dockMenu; - m_pMenu->SetInvokingWindow(m_eventWindow); m_pMenu->UpdateUI(); - return (WX_NSMenu)dockMenu->GetHMenu(); + return (WX_NSMenu)m_pMenu->GetHMenu(); } bool wxTaskBarIconDockImpl::SetIcon(const wxIcon& icon, const wxString& WXUNUSED(tooltip))