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

corrected rebuild of more than one-level hiearchical menus when not directly added to the current menubar

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2001-11-02 20:47:11 +00:00
parent a705ee4785
commit 9673f535ac
2 changed files with 122 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/mac/carbon/menu.cpp
View File

@@ -698,47 +698,85 @@ void wxMenuBar::MacInstallMenuBar()
#else #else
if( m_titles[i] == "?" || m_titles[i] == "&?" || m_titles[i] == wxApp::s_macHelpMenuTitleName ) if( m_titles[i] == "?" || m_titles[i] == "&?" || m_titles[i] == wxApp::s_macHelpMenuTitleName )
{ {
wxMenuItem::MacBuildMenuString( label, NULL , NULL , m_titles[i] , false ); wxMenuItem::MacBuildMenuString( label, NULL , NULL , m_titles[i] , false );
UMASetMenuTitle( menu->GetHMenu() , label ) ; UMASetMenuTitle( menu->GetHMenu() , label ) ;
wxArrayPtrVoid submenus ;
for (pos = 0 , node = menu->GetMenuItems().First(); node; node = node->Next(), pos++) for (pos = 0 , node = menu->GetMenuItems().First(); node; node = node->Next(), pos++)
{ {
item = (wxMenuItem *)node->Data(); item = (wxMenuItem *)node->Data();
subMenu = item->GetSubMenu() ; subMenu = item->GetSubMenu() ;
if (subMenu) if (subMenu)
{ {
::InsertMenu( subMenu->GetHMenu() , -1 ) ; submenus.Add(subMenu) ;
} }
else else
{ {
if ( item->GetId() == wxApp::s_macAboutMenuItemId ) if ( item->GetId() == wxApp::s_macAboutMenuItemId )
{ {
Str255 label ; Str255 label ;
UInt8 modifiers ; UInt8 modifiers ;
SInt16 key ; SInt16 key ;
wxMenuItem::MacBuildMenuString( label, &key , &modifiers , item->GetText(), item->GetId() != wxApp::s_macAboutMenuItemId); // no shortcut in about menu wxMenuItem::MacBuildMenuString( label, &key , &modifiers , item->GetText(), item->GetId() != wxApp::s_macAboutMenuItemId); // no shortcut in about menu
::SetMenuItemText( GetMenuHandle( kwxMacAppleMenuId ) , 1 , label ); ::SetMenuItemText( GetMenuHandle( kwxMacAppleMenuId ) , 1 , label );
UMAEnableMenuItem( GetMenuHandle( kwxMacAppleMenuId ) , 1 ); UMAEnableMenuItem( GetMenuHandle( kwxMacAppleMenuId ) , 1 );
} }
} }
} }
::InsertMenu(m_menus[i]->GetHMenu(), 0); ::InsertMenu(m_menus[i]->GetHMenu(), 0);
for ( int i = 0 ; i < submenus.GetCount() ; ++i )
{
wxMenu* submenu = (wxMenu*) submenus[i] ;
wxNode *subnode;
wxMenuItem *subitem;
int subpos ;
for ( subpos = 0 , subnode = submenu->GetMenuItems().First(); subnode; subnode = subnode->Next(), subpos++)
{
subitem = (wxMenuItem *)subnode->Data();
wxMenu* itsSubMenu = subitem->GetSubMenu() ;
if (itsSubMenu)
{
submenus.Add(itsSubMenu) ;
}
}
::InsertMenu( submenu->GetHMenu() , -1 ) ;
}
} }
#endif #endif
else else
{ {
wxMenuItem::MacBuildMenuString( label, NULL , NULL , m_titles[i] , false ); wxMenuItem::MacBuildMenuString( label, NULL , NULL , m_titles[i] , false );
UMASetMenuTitle( menu->GetHMenu() , label ) ; UMASetMenuTitle( menu->GetHMenu() , label ) ;
wxArrayPtrVoid submenus ;
for (pos = 0, node = menu->GetMenuItems().First(); node; node = node->Next(), pos++) for (pos = 0, node = menu->GetMenuItems().First(); node; node = node->Next(), pos++)
{ {
item = (wxMenuItem *)node->Data(); item = (wxMenuItem *)node->Data();
subMenu = item->GetSubMenu() ; subMenu = item->GetSubMenu() ;
if (subMenu) if (subMenu)
{ {
::InsertMenu( subMenu->GetHMenu() , -1 ) ; submenus.Add(subMenu) ;
} }
} }
::InsertMenu(m_menus[i]->GetHMenu(), 0); ::InsertMenu(m_menus[i]->GetHMenu(), 0);
for ( int i = 0 ; i < submenus.GetCount() ; ++i )
{
wxMenu* submenu = (wxMenu*) submenus[i] ;
wxNode *subnode;
wxMenuItem *subitem;
int subpos ;
for ( subpos = 0 , subnode = submenu->GetMenuItems().First(); subnode; subnode = subnode->Next(), subpos++)
{
subitem = (wxMenuItem *)subnode->Data();
wxMenu* itsSubMenu = subitem->GetSubMenu() ;
if (itsSubMenu)
{
submenus.Add(itsSubMenu) ;
}
}
::InsertMenu( submenu->GetHMenu() , -1 ) ;
}
} }
} }
::DrawMenuBar() ; ::DrawMenuBar() ;

84
src/mac/menu.cpp
View File

@@ -698,47 +698,85 @@ void wxMenuBar::MacInstallMenuBar()
#else #else
if( m_titles[i] == "?" || m_titles[i] == "&?" || m_titles[i] == wxApp::s_macHelpMenuTitleName ) if( m_titles[i] == "?" || m_titles[i] == "&?" || m_titles[i] == wxApp::s_macHelpMenuTitleName )
{ {
wxMenuItem::MacBuildMenuString( label, NULL , NULL , m_titles[i] , false ); wxMenuItem::MacBuildMenuString( label, NULL , NULL , m_titles[i] , false );
UMASetMenuTitle( menu->GetHMenu() , label ) ; UMASetMenuTitle( menu->GetHMenu() , label ) ;
wxArrayPtrVoid submenus ;
for (pos = 0 , node = menu->GetMenuItems().First(); node; node = node->Next(), pos++) for (pos = 0 , node = menu->GetMenuItems().First(); node; node = node->Next(), pos++)
{ {
item = (wxMenuItem *)node->Data(); item = (wxMenuItem *)node->Data();
subMenu = item->GetSubMenu() ; subMenu = item->GetSubMenu() ;
if (subMenu) if (subMenu)
{ {
::InsertMenu( subMenu->GetHMenu() , -1 ) ; submenus.Add(subMenu) ;
} }
else else
{ {
if ( item->GetId() == wxApp::s_macAboutMenuItemId ) if ( item->GetId() == wxApp::s_macAboutMenuItemId )
{ {
Str255 label ; Str255 label ;
UInt8 modifiers ; UInt8 modifiers ;
SInt16 key ; SInt16 key ;
wxMenuItem::MacBuildMenuString( label, &key , &modifiers , item->GetText(), item->GetId() != wxApp::s_macAboutMenuItemId); // no shortcut in about menu wxMenuItem::MacBuildMenuString( label, &key , &modifiers , item->GetText(), item->GetId() != wxApp::s_macAboutMenuItemId); // no shortcut in about menu
::SetMenuItemText( GetMenuHandle( kwxMacAppleMenuId ) , 1 , label ); ::SetMenuItemText( GetMenuHandle( kwxMacAppleMenuId ) , 1 , label );
UMAEnableMenuItem( GetMenuHandle( kwxMacAppleMenuId ) , 1 ); UMAEnableMenuItem( GetMenuHandle( kwxMacAppleMenuId ) , 1 );
} }
} }
} }
::InsertMenu(m_menus[i]->GetHMenu(), 0); ::InsertMenu(m_menus[i]->GetHMenu(), 0);
for ( int i = 0 ; i < submenus.GetCount() ; ++i )
{
wxMenu* submenu = (wxMenu*) submenus[i] ;
wxNode *subnode;
wxMenuItem *subitem;
int subpos ;
for ( subpos = 0 , subnode = submenu->GetMenuItems().First(); subnode; subnode = subnode->Next(), subpos++)
{
subitem = (wxMenuItem *)subnode->Data();
wxMenu* itsSubMenu = subitem->GetSubMenu() ;
if (itsSubMenu)
{
submenus.Add(itsSubMenu) ;
}
}
::InsertMenu( submenu->GetHMenu() , -1 ) ;
}
} }
#endif #endif
else else
{ {
wxMenuItem::MacBuildMenuString( label, NULL , NULL , m_titles[i] , false ); wxMenuItem::MacBuildMenuString( label, NULL , NULL , m_titles[i] , false );
UMASetMenuTitle( menu->GetHMenu() , label ) ; UMASetMenuTitle( menu->GetHMenu() , label ) ;
wxArrayPtrVoid submenus ;
for (pos = 0, node = menu->GetMenuItems().First(); node; node = node->Next(), pos++) for (pos = 0, node = menu->GetMenuItems().First(); node; node = node->Next(), pos++)
{ {
item = (wxMenuItem *)node->Data(); item = (wxMenuItem *)node->Data();
subMenu = item->GetSubMenu() ; subMenu = item->GetSubMenu() ;
if (subMenu) if (subMenu)
{ {
::InsertMenu( subMenu->GetHMenu() , -1 ) ; submenus.Add(subMenu) ;
} }
} }
::InsertMenu(m_menus[i]->GetHMenu(), 0); ::InsertMenu(m_menus[i]->GetHMenu(), 0);
for ( int i = 0 ; i < submenus.GetCount() ; ++i )
{
wxMenu* submenu = (wxMenu*) submenus[i] ;
wxNode *subnode;
wxMenuItem *subitem;
int subpos ;
for ( subpos = 0 , subnode = submenu->GetMenuItems().First(); subnode; subnode = subnode->Next(), subpos++)
{
subitem = (wxMenuItem *)subnode->Data();
wxMenu* itsSubMenu = subitem->GetSubMenu() ;
if (itsSubMenu)
{
submenus.Add(itsSubMenu) ;
}
}
::InsertMenu( submenu->GetHMenu() , -1 ) ;
}
} }
} }
::DrawMenuBar() ; ::DrawMenuBar() ;