AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing Popup Menu with Submenus

Browse Source 
Submenus have to turn off autoenablind as well, see #549 and https://trac.wxwidgets.org/ticket/17459
This commit is contained in:
Stefan Csomor 2017-09-07 20:27:49 +02:00
parent 37191f6f16
commit 102edb544d
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/osx/cocoa/menu.mm
View File

@ -241,7 +241,7 @@ public :
NSView *view = win->GetPeer()->GetWXWidget();
// Turn off auto-enable; it caused popup menus inside of dialogs
// to be entirely disabled.
[m_osxMenu setAutoenablesItems:NO];
DisableAutoEnable();
[m_osxMenu popUpMenuPositioningItem:nil atLocation:NSMakePoint(x, y) inView:view];
}
@ -254,6 +254,23 @@ public :
width = r.size.width;
}
void DisableAutoEnable()
{
[m_osxMenu setAutoenablesItems:NO];
wxMenu* menu = GetWXPeer();
for ( auto item : menu->GetMenuItems() )
{
if ( item->IsSubMenu() )
{
wxMenuCocoaImpl* subimpl = dynamic_cast<wxMenuCocoaImpl*>(item->GetSubMenu()->GetPeer());
if ( subimpl )
subimpl->DisableAutoEnable();
}
}
}
WXHMENU GetHMenu() wxOVERRIDE { return m_osxMenu; }
static wxMenuImpl* Create( wxMenu* peer, const wxString& title );