// Construct a menu with optional title (then use append)
-#ifdef __UNIX__
+#ifdef __DARWIN__
short wxMenu::s_macNextMenuId = 3 ;
#else
short wxMenu::s_macNextMenuId = 2 ;
wxMenuItem::MacBuildMenuString( label, NULL , NULL , m_title , false );
m_macMenuId = s_macNextMenuId++;
wxCHECK_RET( s_macNextMenuId < 236 , "menu ids > 235 cannot be used for submenus on mac" );
- m_hMenu = UMANewMenu(m_macMenuId, label);
+ m_hMenu = ::NewMenu(m_macMenuId, label);
if ( !m_hMenu )
{
wxMenu::~wxMenu()
{
if (m_hMenu)
- UMADisposeMenu(m_hMenu);
+ ::DisposeMenu(m_hMenu);
#if wxUSE_ACCEL
// delete accels
if (wxMenuBar::MacGetInstalledMenuBar() == m_menuBar)
{
- UMAInsertMenu( pSubMenu->m_hMenu , -1 ) ;
+ ::InsertMenu( pSubMenu->m_hMenu , -1 ) ;
}
if ( pos == (size_t)-1 )
return true ;
}
}
-#ifndef __WXMAC_X__
+#ifndef __DARWIN__
else if ( macMenuId == kHMHelpMenuID )
{
int menuItem = formerHelpMenuItems ;
}
}
}
-#endif // __WXMAC_X__
+#endif // __DARWIN__
for (pos = 0, node = GetMenuItems().First(); node; node = node->Next(), pos++)
{
}
if ( item->GetId() == wxApp::s_macAboutMenuItemId )
{
- UMASetMenuItemText( GetMenuHandle( kwxMacAppleMenuId ) , 1 , label );
+ ::SetMenuItemText( GetMenuHandle( kwxMacAppleMenuId ) , 1 , label );
UMAEnableMenuItem( GetMenuHandle( kwxMacAppleMenuId ) , 1 );
}
else
subMenu = item->GetSubMenu() ;
if (subMenu)
{
- UMAInsertMenu( subMenu->GetHMenu() , -1 ) ;
+ ::InsertMenu( subMenu->GetHMenu() , -1 ) ;
}
else
{
UInt8 modifiers ;
SInt16 key ;
wxMenuItem::MacBuildMenuString( label, &key , &modifiers , item->GetText(), item->GetId() != wxApp::s_macAboutMenuItemId); // no shortcut in about menu
- UMASetMenuItemText( GetMenuHandle( kwxMacAppleMenuId ) , 1 , label );
+ ::SetMenuItemText( GetMenuHandle( kwxMacAppleMenuId ) , 1 , label );
UMAEnableMenuItem( GetMenuHandle( kwxMacAppleMenuId ) , 1 );
}
}
}
- UMAInsertMenu(m_menus[i]->GetHMenu(), 0);
+ ::InsertMenu(m_menus[i]->GetHMenu(), 0);
}
#endif
else
subMenu = item->GetSubMenu() ;
if (subMenu)
{
- UMAInsertMenu( subMenu->GetHMenu() , -1 ) ;
+ ::InsertMenu( subMenu->GetHMenu() , -1 ) ;
}
}
- UMAInsertMenu(m_menus[i]->GetHMenu(), 0);
+ ::InsertMenu(m_menus[i]->GetHMenu(), 0);
}
}
- UMADrawMenuBar() ;
+ ::DrawMenuBar() ;
s_macInstalledMenuBar = this;
}
{
if (s_macInstalledMenuBar == this)
{
- UMADeleteMenu( menuOld->MacGetMenuId() /* m_menus[pos]->MacGetMenuId() */ ) ;
+ ::DeleteMenu( menuOld->MacGetMenuId() /* m_menus[pos]->MacGetMenuId() */ ) ;
{
Str255 label;
wxMenuItem::MacBuildMenuString( label, NULL , NULL , title , false );
UMASetMenuTitle( menu->GetHMenu() , label ) ;
if ( pos == m_menus.GetCount() - 1)
{
- UMAInsertMenu( menu->GetHMenu() , 0 ) ;
+ ::InsertMenu( menu->GetHMenu() , 0 ) ;
}
else
{
- UMAInsertMenu( menu->GetHMenu() , m_menus[pos+1]->MacGetMenuId() ) ;
+ ::InsertMenu( menu->GetHMenu() , m_menus[pos+1]->MacGetMenuId() ) ;
}
}
}
for (int i = 0; i < m_menus.GetCount() ; i++)
{
if ( m_menus[i]->MacGetMenuId() == macMenuId
-#ifndef __WXMAC_X__
+#ifndef __DARWIN__
||
( macMenuId == kHMHelpMenuID && ( m_titles[i] == "?" || m_titles[i] == "&?" || m_titles[i] == wxApp::s_macHelpMenuTitleName ) )
#endif