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

Fix menu creation in wxOSX/Carbon when using wx in a plugin.

Browse Source 
In this case the host application may have its own menu so we need to avoid
conflicting with its menu elements.

Closes #13832.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-01-08 14:52:59 +00:00
parent d1bf0be0bc
commit 1076e695b4
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/osx/carbon/menu.cpp
View File

@@ -183,7 +183,8 @@ protected :
class wxMenuCarbonImpl : public wxMenuImpl class wxMenuCarbonImpl : public wxMenuImpl
{ {
public : public :
wxMenuCarbonImpl( wxMenu* peer , MenuRef menu) : wxMenuImpl(peer), m_osxMenu(menu) wxMenuCarbonImpl( wxMenu* peer , MenuRef menu , MenuRef oldMenu , SInt16 menuId)
: wxMenuImpl(peer), m_osxMenu(menu), m_oldMenuRef(oldMenu), m_menuId(menuId)
{ {
} }
@@ -280,6 +281,8 @@ public :
static wxMenuImpl* CreateRootMenu( wxMenu* peer ); static wxMenuImpl* CreateRootMenu( wxMenu* peer );
protected : protected :
wxCFRef<MenuRef> m_osxMenu; wxCFRef<MenuRef> m_osxMenu;
MenuRef m_oldMenuRef;
SInt16 m_menuId;
} ; } ;
// static const short kwxMacAppleMenuId = 1 ; // static const short kwxMacAppleMenuId = 1 ;
@@ -325,21 +328,35 @@ void wxRemoveMacMenuAssociation(wxMenu *menu)
wxMenuCarbonImpl::~wxMenuCarbonImpl() wxMenuCarbonImpl::~wxMenuCarbonImpl()
{ {
wxRemoveMacMenuAssociation( GetWXPeer() ); wxRemoveMacMenuAssociation( GetWXPeer() );
// restore previous menu
m_osxMenu.reset();
if ( m_menuId > 0 )
MacDeleteMenu(m_menuId);
if ( m_oldMenuRef )
MacInsertMenu(m_oldMenuRef, -1);
} }
wxMenuImpl* wxMenuImpl::Create( wxMenu* peer, const wxString& title ) wxMenuImpl* wxMenuImpl::Create( wxMenu* peer, const wxString& title )
{ {
// create the menu // create the menu
static SInt16 s_macNextMenuId = 3; static SInt16 s_macNextMenuId = 3;
SInt16 menuId = s_macNextMenuId++;
// save existing menu in case we're embedding into an application
// or sharing outside UI elements.
WXHMENU oldMenu = GetMenuHandle(menuId);
if ( oldMenu )
MacDeleteMenu(menuId);
WXHMENU menu = NULL; WXHMENU menu = NULL;
CreateNewMenu( s_macNextMenuId++ , 0 , &menu ) ; CreateNewMenu( menuId , 0 , &menu ) ;
if ( !menu ) if ( !menu )
{ {
wxLogLastError(wxT("CreateNewMenu failed")); wxLogLastError(wxT("CreateNewMenu failed"));
if ( oldMenu )
MacInsertMenu(oldMenu, -1);
return NULL; return NULL;
} }
wxMenuImpl* c = new wxMenuCarbonImpl( peer, menu ); wxMenuImpl* c = new wxMenuCarbonImpl( peer, menu, oldMenu, menuId );
c->SetTitle(title); c->SetTitle(title);
wxAssociateMenuWithMacMenu( menu , peer ) ; wxAssociateMenuWithMacMenu( menu , peer ) ;
return c; return c;