Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of an unnecessary local variable

Browse Source 
No real changes, just simplify the code a bit more.
This commit is contained in:
Vadim Zeitlin
2020-08-14 19:43:00 +02:00
parent cdd68da370
commit c5161f6296
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/osx/cocoa/taskbar.mm
View File

@@ -252,25 +252,23 @@ WX_NSMenu wxTaskBarIconDockImpl::OSXDoGetDockHMenu()
{ {
m_menuDeleter.reset(); 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; return nil;
m_menuDeleter.reset(dockMenu); m_menuDeleter.reset(m_pMenu);
} }
m_pMenu = dockMenu;
m_pMenu->SetInvokingWindow(m_eventWindow); m_pMenu->SetInvokingWindow(m_eventWindow);
m_pMenu->UpdateUI(); m_pMenu->UpdateUI();
return (WX_NSMenu)dockMenu->GetHMenu(); return (WX_NSMenu)m_pMenu->GetHMenu();
} }
bool wxTaskBarIconDockImpl::SetIcon(const wxIcon& icon, const wxString& WXUNUSED(tooltip)) bool wxTaskBarIconDockImpl::SetIcon(const wxIcon& icon, const wxString& WXUNUSED(tooltip))