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

about menu item changes : can appear anywhere in a menu, separator lines above or below will be consolidated, help menu will not be shown if this was the only line

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2005-04-24 09:15:14 +00:00
parent 121c09cd1a
commit 6524e8f0ee
1 changed files with 99 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,7 +44,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler)
// the (popup) menu title has this special id // the (popup) menu title has this special id
static const int idMenuTitle = -3; static const int idMenuTitle = -3;
static MenuItemIndex firstUserHelpMenuItem = 0 ;
const short kwxMacMenuBarResource = 1 ; const short kwxMacMenuBarResource = 1 ;
const short kwxMacAppleMenuId = 1 ; const short kwxMacAppleMenuId = 1 ;
@@ -460,13 +459,14 @@ void wxMenu::MacBeforeDisplay( bool isSubMenu )
else // normal item else // normal item
{ {
#if TARGET_CARBON #if TARGET_CARBON
if ( UMAGetSystemVersion() >= 0x1000 )
{
// what we do here is to hide the special items which are // what we do here is to hide the special items which are
// shown in the application menu anyhow -- it doesn't make // shown in the application menu anyhow -- it doesn't make
// sense to show them in their normal place as well // sense to show them in their normal place as well
if ( item->GetId() == wxApp::s_macPreferencesMenuItemId || if ( item->GetId() == wxApp::s_macAboutMenuItemId ||
item->GetId() == wxApp::s_macExitMenuItemId ) ( UMAGetSystemVersion() >= 0x1000 && (
item->GetId() == wxApp::s_macPreferencesMenuItemId ||
item->GetId() == wxApp::s_macExitMenuItemId ) ) )
{ {
ChangeMenuItemAttributes( MAC_WXHMENU( GetHMenu() ), ChangeMenuItemAttributes( MAC_WXHMENU( GetHMenu() ),
pos + 1, kMenuItemAttrHidden, 0 ); pos + 1, kMenuItemAttrHidden, 0 );
@@ -513,7 +513,6 @@ void wxMenu::MacBeforeDisplay( bool isSubMenu )
0 ); 0 );
} }
} }
}
#endif // TARGET_CARBON #endif // TARGET_CARBON
} }
previousItem = item ; previousItem = item ;
@@ -655,6 +654,10 @@ void wxMenuBar::MacInstallMenuBar()
// clean-up the help menu before adding new items // clean-up the help menu before adding new items
MenuHandle mh = NULL ; MenuHandle mh = NULL ;
if ( mh != NULL )
{
MenuItemIndex firstUserHelpMenuItem ;
if ( UMAGetHelpMenu( &mh , &firstUserHelpMenuItem) == noErr ) if ( UMAGetHelpMenu( &mh , &firstUserHelpMenuItem) == noErr )
{ {
for ( int i = CountMenuItems( mh ) ; i >= firstUserHelpMenuItem ; --i ) for ( int i = CountMenuItems( mh ) ; i >= firstUserHelpMenuItem ; --i )
@@ -666,6 +669,7 @@ void wxMenuBar::MacInstallMenuBar()
{ {
mh = NULL ; mh = NULL ;
} }
}
#if TARGET_CARBON #if TARGET_CARBON
if ( UMAGetSystemVersion() >= 0x1000 && wxApp::s_macPreferencesMenuItemId) if ( UMAGetSystemVersion() >= 0x1000 && wxApp::s_macPreferencesMenuItemId)
{ {
@@ -699,11 +703,6 @@ void wxMenuBar::MacInstallMenuBar()
if( m_titles[i] == wxT("?") || m_titles[i] == wxT("&?") || m_titles[i] == wxApp::s_macHelpMenuTitleName ) if( m_titles[i] == wxT("?") || m_titles[i] == wxT("&?") || m_titles[i] == wxApp::s_macHelpMenuTitleName )
{ {
if ( mh == NULL )
{
continue ;
}
for (pos = 0 , node = menu->GetMenuItems().GetFirst(); node; node = node->GetNext(), pos++) for (pos = 0 , node = menu->GetMenuItems().GetFirst(); node; node = node->GetNext(), pos++)
{ {
item = (wxMenuItem *)node->GetData(); item = (wxMenuItem *)node->GetData();
@@ -714,6 +713,21 @@ void wxMenuBar::MacInstallMenuBar()
} }
else else
{ {
if ( item->GetId() != wxApp::s_macAboutMenuItemId )
{
if ( mh == NULL )
{
MenuItemIndex firstUserHelpMenuItem ;
if ( UMAGetHelpMenu( &mh , &firstUserHelpMenuItem) == noErr )
{
}
else
{
mh = NULL ;
break ;
}
}
}
if ( item->IsSeparator() ) if ( item->IsSeparator() )
{ {
if ( mh ) if ( mh )
@@ -725,11 +739,7 @@ void wxMenuBar::MacInstallMenuBar()
if ( item->GetId() == wxApp::s_macAboutMenuItemId ) if ( item->GetId() == wxApp::s_macAboutMenuItemId )
{ {
UMASetMenuItemText( GetMenuHandle( kwxMacAppleMenuId ) , 1 , item->GetText() , wxFont::GetDefaultEncoding() ); // this will be taken care of below
UMAEnableMenuItem( GetMenuHandle( kwxMacAppleMenuId ) , 1 , true );
SetMenuItemCommandID( GetMenuHandle( kwxMacAppleMenuId ) , 1 , item->GetId() ) ;
SetMenuItemRefCon(GetMenuHandle( kwxMacAppleMenuId ) , 1 , (UInt32)item ) ;
UMASetMenuItemShortcut( GetMenuHandle( kwxMacAppleMenuId ) , 1 , entry ) ;
} }
else else
{ {
@@ -753,6 +763,20 @@ void wxMenuBar::MacInstallMenuBar()
::InsertMenu(MAC_WXHMENU(_wxMenuAt(m_menus, i)->GetHMenu()), 0); ::InsertMenu(MAC_WXHMENU(_wxMenuAt(m_menus, i)->GetHMenu()), 0);
} }
} }
// take care of the about menu item wherever it is
{
wxMenu* aboutMenu ;
wxMenuItem *aboutMenuItem = FindItem(wxApp::s_macAboutMenuItemId , &aboutMenu) ;
if ( aboutMenuItem )
{
wxAcceleratorEntry* entry = wxGetAccelFromString( aboutMenuItem->GetText() ) ;
UMASetMenuItemText( GetMenuHandle( kwxMacAppleMenuId ) , 1 , aboutMenuItem->GetText() , wxFont::GetDefaultEncoding() );
UMAEnableMenuItem( GetMenuHandle( kwxMacAppleMenuId ) , 1 , true );
SetMenuItemCommandID( GetMenuHandle( kwxMacAppleMenuId ) , 1 , aboutMenuItem->GetId() ) ;
SetMenuItemRefCon(GetMenuHandle( kwxMacAppleMenuId ) , 1 , (UInt32)aboutMenuItem ) ;
UMASetMenuItemShortcut( GetMenuHandle( kwxMacAppleMenuId ) , 1 , entry ) ;
}
}
::DrawMenuBar() ; ::DrawMenuBar() ;
s_macInstalledMenuBar = this; s_macInstalledMenuBar = this;
} }