// the (popup) menu title has this special id
static const int idMenuTitle = -2;
-static int formerHelpMenuItems = 0 ;
+static MenuItemIndex firstUserHelpMenuItem = 0 ;
const short kwxMacMenuBarResource = 1 ;
const short kwxMacAppleMenuId = 1 ;
wxMenu::~wxMenu()
{
- if (m_hMenu)
- ::DisposeMenu(m_hMenu);
+ if (MAC_WXHMENU(m_hMenu))
+ ::DisposeMenu(MAC_WXHMENU(m_hMenu));
#if wxUSE_ACCEL
// delete accels
{
if ( pos == (size_t)-1 )
{
- MacAppendMenu(m_hMenu, "\p-");
+ MacAppendMenu(MAC_WXHMENU(m_hMenu), "\p-");
}
else
{
- MacInsertMenuItem(m_hMenu, "\p-" , pos);
+ MacInsertMenuItem(MAC_WXHMENU(m_hMenu), "\p-" , pos);
}
}
else
if (wxMenuBar::MacGetInstalledMenuBar() == m_menuBar)
{
- ::InsertMenu( pSubMenu->m_hMenu , -1 ) ;
+ ::InsertMenu( MAC_WXHMENU( pSubMenu->m_hMenu ) , -1 ) ;
}
if ( pos == (size_t)-1 )
{
- UMAAppendSubMenuItem(m_hMenu, label, pSubMenu->m_macMenuId);
+ UMAAppendSubMenuItem(MAC_WXHMENU(m_hMenu), label, pSubMenu->m_macMenuId);
}
else
{
- UMAInsertSubMenuItem(m_hMenu, label , pos, pSubMenu->m_macMenuId);
+ UMAInsertSubMenuItem(MAC_WXHMENU(m_hMenu), label , pos, pSubMenu->m_macMenuId);
}
}
else
}
if ( pos == (size_t)-1 )
{
- UMAAppendMenuItem(m_hMenu, label,key,modifiers);
+ UMAAppendMenuItem(MAC_WXHMENU(m_hMenu), label,key,modifiers);
}
else
{
- UMAInsertMenuItem(m_hMenu, label , pos,key,modifiers);
+ UMAInsertMenuItem(MAC_WXHMENU(m_hMenu), label , pos,key,modifiers);
}
if ( pItem->GetId() == idMenuTitle )
{
if ( pos == (size_t)-1 )
{
- UMADisableMenuItem( m_hMenu , CountMenuItems( m_hMenu ) ) ;
+ UMADisableMenuItem(MAC_WXHMENU(m_hMenu) , CountMenuItems(MAC_WXHMENU(m_hMenu) ) ) ;
}
else
{
- UMADisableMenuItem( m_hMenu , pos + 1 ) ;
+ UMADisableMenuItem(MAC_WXHMENU(m_hMenu) , pos + 1 ) ;
}
}
}
//else: this item doesn't have an accel, nothing to do
#endif // wxUSE_ACCEL
- ::DeleteMenuItem( m_hMenu , pos + 1);
+ ::DeleteMenuItem(MAC_WXHMENU(m_hMenu) , pos + 1);
if ( IsAttached() )
{
Str255 title ;
m_title = label ;
wxMenuItem::MacBuildMenuString( title, NULL , NULL , label , false );
- UMASetMenuTitle( m_hMenu , title ) ;
+ UMASetMenuTitle(MAC_WXHMENU(m_hMenu) , title ) ;
}
bool wxMenu::ProcessCommand(wxCommandEvent & event)
{
void wxMenu::MacEnableMenu( bool bDoEnable )
{
if ( bDoEnable )
- UMAEnableMenuItem( m_hMenu , 0 ) ;
+ UMAEnableMenuItem(MAC_WXHMENU(m_hMenu) , 0 ) ;
else
- UMADisableMenuItem( m_hMenu , 0 ) ;
+ UMADisableMenuItem(MAC_WXHMENU(m_hMenu) , 0 ) ;
::DrawMenuBar() ;
}
bool wxMenu::MacMenuSelect( wxEvtHandler* handler, long when , int macMenuId, int macMenuItemNum )
{
- int pos;
- wxNode *node;
-
- if ( m_macMenuId == macMenuId )
- {
- node = GetMenuItems().Nth(macMenuItemNum-1);
- if (node)
- {
- wxMenuItem *pItem = (wxMenuItem*)node->Data();
-
- if (pItem->IsCheckable())
- pItem->Check(! pItem->IsChecked());
-
- wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED, pItem->GetId());
- event.m_timeStamp = when;
- event.SetEventObject(handler);
- event.SetInt( pItem->GetId() );
- {
- bool processed = false ;
+ int pos;
+ wxNode *node;
+ if ( m_macMenuId == macMenuId )
+ {
+ node = GetMenuItems().Nth(macMenuItemNum-1);
+ if (node)
+ {
+ wxMenuItem *pItem = (wxMenuItem*)node->Data();
+
+ if (pItem->IsCheckable())
+ pItem->Check(! pItem->IsChecked());
+
+ wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED, pItem->GetId());
+ event.m_timeStamp = when;
+ event.SetEventObject(handler);
+ event.SetInt( pItem->GetId() );
+ {
+ bool processed = false ;
+
#if WXWIN_COMPATIBILITY
- // Try a callback
- if (m_callback)
- {
- (void) (*(m_callback)) (*this, event);
- processed = TRUE;
- }
+ // Try a callback
+ if (m_callback)
+ {
+ (void) (*(m_callback)) (*this, event);
+ processed = TRUE;
+ }
#endif
- // Try the menu's event handler
- if ( !processed && handler)
- {
- processed = handler->ProcessEvent(event);
- }
-
- // Try the window the menu was popped up from (and up
- // through the hierarchy)
- if ( !processed && GetInvokingWindow())
- processed = GetInvokingWindow()->GetEventHandler()->ProcessEvent(event);
- }
- return true ;
- }
- }
-#ifndef __DARWIN__
- else if ( macMenuId == kHMHelpMenuID )
- {
- int menuItem = formerHelpMenuItems ;
- for (pos = 0, node = GetMenuItems().First(); node; node = node->Next(), pos++)
- {
- wxMenuItem * pItem = (wxMenuItem *) node->Data() ;
-
- wxMenu *pSubMenu = pItem->GetSubMenu() ;
- if ( pSubMenu != NULL )
- {
- }
- else
- {
- if ( pItem->GetId() != wxApp::s_macAboutMenuItemId )
- ++menuItem ;
-
- if ( menuItem == macMenuItemNum )
- {
- wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED, pItem->GetId());
- event.m_timeStamp = when;
- event.SetEventObject(handler);
- event.SetInt( pItem->GetId() );
- {
- bool processed = false ;
+ // Try the menu's event handler
+ if ( !processed && handler)
+ {
+ processed = handler->ProcessEvent(event);
+ }
+
+ // Try the window the menu was popped up from (and up
+ // through the hierarchy)
+ if ( !processed && GetInvokingWindow())
+ processed = GetInvokingWindow()->GetEventHandler()->ProcessEvent(event);
+ }
+ return true ;
+ }
+ }
+ else if ( macMenuId == kHMHelpMenuID )
+ {
+ int menuItem = firstUserHelpMenuItem-1 ;
+ for (pos = 0, node = GetMenuItems().First(); node; node = node->Next(), pos++)
+ {
+ wxMenuItem * pItem = (wxMenuItem *) node->Data() ;
+
+ wxMenu *pSubMenu = pItem->GetSubMenu() ;
+ if ( pSubMenu != NULL )
+ {
+ }
+ else
+ {
+ if ( pItem->GetId() != wxApp::s_macAboutMenuItemId )
+ ++menuItem ;
+
+ if ( menuItem == macMenuItemNum )
+ {
+ wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED, pItem->GetId());
+ event.m_timeStamp = when;
+ event.SetEventObject(handler);
+ event.SetInt( pItem->GetId() );
+ {
+ bool processed = false ;
#if WXWIN_COMPATIBILITY
- // Try a callback
- if (m_callback)
- {
- (void) (*(m_callback)) (*this, event);
- processed = TRUE;
- }
+ // Try a callback
+ if (m_callback)
+ {
+ (void) (*(m_callback)) (*this, event);
+ processed = TRUE;
+ }
#endif
- // Try the menu's event handler
- if ( !processed && handler)
- {
- processed = handler->ProcessEvent(event);
- }
-
- // Try the window the menu was popped up from (and up
- // through the hierarchy)
- if ( !processed && GetInvokingWindow())
- processed = GetInvokingWindow()->GetEventHandler()->ProcessEvent(event);
- }
- return true ;
- }
- }
- }
- }
-#endif // __DARWIN__
-
- for (pos = 0, node = GetMenuItems().First(); node; node = node->Next(), pos++)
- {
- wxMenuItem * pItem = (wxMenuItem *) node->Data() ;
+ // Try the menu's event handler
+ if ( !processed && handler)
+ {
+ processed = handler->ProcessEvent(event);
+ }
+
+ // Try the window the menu was popped up from (and up
+ // through the hierarchy)
+ if ( !processed && GetInvokingWindow())
+ processed = GetInvokingWindow()->GetEventHandler()->ProcessEvent(event);
+ }
+ return true ;
+ }
+ }
+ }
+ }
+
+ for (pos = 0, node = GetMenuItems().First(); node; node = node->Next(), pos++)
+ {
+ wxMenuItem * pItem = (wxMenuItem *) node->Data() ;
- wxMenu *pSubMenu = pItem->GetSubMenu() ;
- if ( pSubMenu != NULL )
- {
- if ( pSubMenu->MacMenuSelect( handler , when , macMenuId , macMenuItemNum ) )
- return true ;
- }
- }
-
- return false ;
+ wxMenu *pSubMenu = pItem->GetSubMenu() ;
+ if ( pSubMenu != NULL )
+ {
+ if ( pSubMenu->MacMenuSelect( handler , when , macMenuId , macMenuItemNum ) )
+ return true ;
+ }
+ }
+
+ return false ;
}
// Menu Bar
}
#endif // wxUSE_ACCEL
-
-
+#ifdef WXMAKINGDLL
+extern short gCurrentResource ;
+#endif
void wxMenuBar::MacInstallMenuBar()
{
if ( s_macInstalledMenuBar == this )
return ;
+ wxStAppResource resload ;
+
Handle menubar = ::GetNewMBar( kwxMacMenuBarResource ) ;
wxString message ;
wxCHECK_RET( menubar != NULL, "can't read MBAR resource" );
::SetMenuBar( menubar ) ;
+#if TARGET_API_MAC_CARBON
+ ::DisposeMenuBar( menubar ) ;
+#else
::DisposeHandle( menubar ) ;
+#endif
MenuHandle menu = ::GetMenuHandle( kwxMacAppleMenuId ) ;
- ::AppendResMenu(menu, 'DRVR');
+#if TARGET_API_MAC_OS8
+ if ( CountMenuItems( menu ) == 2 )
+ {
+ ::AppendResMenu(menu, 'DRVR');
+ }
+#endif
for (int i = 0; i < m_menus.GetCount(); i++)
{
int pos ;
wxMenu* menu = m_menus[i] , *subMenu = NULL ;
-#if !TARGET_CARBON
- /* the help menu does not exist in CARBON anymore */
if( m_titles[i] == "?" || m_titles[i] == "&?" || m_titles[i] == wxApp::s_macHelpMenuTitleName )
{
MenuHandle mh = NULL ;
- if ( HMGetHelpMenuHandle( &mh ) != noErr )
- {
- continue ;
- }
- if ( formerHelpMenuItems == 0 )
- {
- if( mh )
- formerHelpMenuItems = CountMenuItems( mh ) ;
- }
+ if ( UMAGetHelpMenu( &mh , &firstUserHelpMenuItem) != noErr )
+ {
+ continue ;
+ }
+
+ for ( int i = CountMenuItems( mh ) ; i >= firstUserHelpMenuItem ; --i )
+ {
+ DeleteMenuItem( mh , i ) ;
+ }
for (pos = 0 , node = menu->GetMenuItems().First(); node; node = node->Next(), pos++)
{
if ( item->IsSeparator() )
{
if ( mh )
- UMAAppendMenuItem(mh, "\p-" );
+ MacAppendMenu(mh, "\p-" );
}
else
{
}
}
}
-#else
- if( m_titles[i] == "?" || m_titles[i] == "&?" || m_titles[i] == wxApp::s_macHelpMenuTitleName )
- {
- wxMenuItem::MacBuildMenuString( label, NULL , NULL , m_titles[i] , false );
- UMASetMenuTitle( menu->GetHMenu() , label ) ;
-
- wxArrayPtrVoid submenus ;
-
- for (pos = 0 , node = menu->GetMenuItems().First(); node; node = node->Next(), pos++)
- {
- item = (wxMenuItem *)node->Data();
- subMenu = item->GetSubMenu() ;
- if (subMenu)
- {
- submenus.Add(subMenu) ;
- }
- else
- {
- if ( item->GetId() == wxApp::s_macAboutMenuItemId )
- {
- Str255 label ;
- UInt8 modifiers ;
- SInt16 key ;
- wxMenuItem::MacBuildMenuString( label, &key , &modifiers , item->GetText(), item->GetId() != wxApp::s_macAboutMenuItemId); // no shortcut in about menu
- ::SetMenuItemText( GetMenuHandle( kwxMacAppleMenuId ) , 1 , label );
- UMAEnableMenuItem( GetMenuHandle( kwxMacAppleMenuId ) , 1 );
- }
- }
- }
- ::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
else
{
wxMenuItem::MacBuildMenuString( label, NULL , NULL , m_titles[i] , false );
- UMASetMenuTitle( menu->GetHMenu() , label ) ;
+ UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , label ) ;
wxArrayPtrVoid submenus ;
for (pos = 0, node = menu->GetMenuItems().First(); node; node = node->Next(), pos++)
submenus.Add(subMenu) ;
}
}
- ::InsertMenu(m_menus[i]->GetHMenu(), 0);
+ ::InsertMenu(MAC_WXHMENU(m_menus[i]->GetHMenu()), 0);
for ( int i = 0 ; i < submenus.GetCount() ; ++i )
{
wxMenu* submenu = (wxMenu*) submenus[i] ;
submenus.Add(itsSubMenu) ;
}
}
- ::InsertMenu( submenu->GetHMenu() , -1 ) ;
+ ::InsertMenu( MAC_WXHMENU(submenu->GetHMenu()) , -1 ) ;
}
}
}
::DrawMenuBar() ;
-
s_macInstalledMenuBar = this;
}
{
Str255 label;
wxMenuItem::MacBuildMenuString( label, NULL , NULL , title , false );
- UMASetMenuTitle( menu->GetHMenu() , label ) ;
+ UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , label ) ;
if ( pos == m_menus.GetCount() - 1)
{
- ::InsertMenu( menu->GetHMenu() , 0 ) ;
+ ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , 0 ) ;
}
else
{
- ::InsertMenu( menu->GetHMenu() , m_menus[pos+1]->MacGetMenuId() ) ;
+ ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , m_menus[pos+1]->MacGetMenuId() ) ;
}
}
}
m_titles.Insert(title, pos);
- menu->Attach(this);
+ Str255 label ;
+ wxMenuItem::MacBuildMenuString( label, NULL , NULL , title , false );
+ UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , label ) ;
if ( IsAttached() )
{
- if ( pos == (size_t) -1 )
+ if ( pos == (size_t) -1 || pos + 1 == m_menus.GetCount() )
{
- ::InsertMenu( menu->GetHMenu() , 0 ) ;
+ ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , 0 ) ;
}
else
{
- ::InsertMenu( menu->GetHMenu() , m_menus[pos+1]->MacGetMenuId() ) ;
+ ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , m_menus[pos+1]->MacGetMenuId() ) ;
}
#if wxUSE_ACCEL
void wxMenuBar::MacMenuSelect(wxEvtHandler* handler, long when , int macMenuId, int macMenuItemNum)
{
- // first scan fast for direct commands, i.e. menus which have these commands directly in their own list
-
- if ( macMenuId == kwxMacAppleMenuId && macMenuItemNum == 1 )
- {
- wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED, wxApp::s_macAboutMenuItemId );
- event.m_timeStamp = when;
- event.SetEventObject(handler);
- event.SetInt( wxApp::s_macAboutMenuItemId );
- handler->ProcessEvent(event);
- }
- else
- {
- for (int i = 0; i < m_menus.GetCount() ; i++)
- {
- if ( m_menus[i]->MacGetMenuId() == macMenuId
-#ifndef __DARWIN__
- ||
- ( macMenuId == kHMHelpMenuID && ( m_titles[i] == "?" || m_titles[i] == "&?" || m_titles[i] == wxApp::s_macHelpMenuTitleName ) )
-#endif
- )
- {
- if ( m_menus[i]->MacMenuSelect( handler , when , macMenuId , macMenuItemNum ) )
- return ;
- else
- {
- //TODO flag this as an error since it must contain the item
- return ;
- }
- }
- }
+ // first scan fast for direct commands, i.e. menus which have these commands directly in their own list
+
+ if ( macMenuId == kwxMacAppleMenuId && macMenuItemNum == 1 )
+ {
+ wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED, wxApp::s_macAboutMenuItemId );
+ event.m_timeStamp = when;
+ event.SetEventObject(handler);
+ event.SetInt( wxApp::s_macAboutMenuItemId );
+ handler->ProcessEvent(event);
+ }
+ else
+ {
+ for (int i = 0; i < m_menus.GetCount() ; i++)
+ {
+ if ( m_menus[i]->MacGetMenuId() == macMenuId || ( macMenuId == kHMHelpMenuID && ( m_titles[i] == "?" || m_titles[i] == "&?" || m_titles[i] == wxApp::s_macHelpMenuTitleName ) ) )
+ {
+ if ( m_menus[i]->MacMenuSelect( handler , when , macMenuId , macMenuItemNum ) )
+ return ;
+ else
+ {
+ //TODO flag this as an error since it must contain the item
+ return ;
+ }
+ }
+ }
for (int i = 0; i < m_menus.GetCount(); i++)
{
return FALSE;
m_titles.Add(title);
+
+ Str255 label ;
+ wxMenuItem::MacBuildMenuString( label, NULL , NULL , title , false );
+ UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , label ) ;
if ( IsAttached() )
{
- if (s_macInstalledMenuBar == this)
- {
- ::InsertMenu( menu->GetHMenu() , 0 ) ;
- }
+ if (s_macInstalledMenuBar == this)
+ {
+ ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , 0 ) ;
+ }
#if wxUSE_ACCEL
if ( menu->HasAccels() )
projects / wxWidgets.git / blobdiff