Smooth Aqua buttons in wxTreeCtrl.

[wxWidgets.git] / src / mac / menu.cpp

diff --git a/src/mac/menu.cpp b/src/mac/menu.cpp
index 6956a0987adde5647ae5fdcb9f865e69a8697e6c..df302f9e69f5bdf25ecf7fd9af54ca32c3c0f401 100644 (file)
--- a/src/mac/menu.cpp
+++ b/src/mac/menu.cpp
@@ -42,7 +42,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler)
 
 // 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 ;
@@ -71,7 +71,7 @@ void wxMenu::Init()
        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 )
     {
@@ -89,7 +89,7 @@ void wxMenu::Init()
 wxMenu::~wxMenu()
 {
        if (m_hMenu)
-               UMADisposeMenu(m_hMenu);
+               ::DisposeMenu(m_hMenu);
 
 #if wxUSE_ACCEL
     // delete accels
@@ -183,7 +183,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
                
                        if (wxMenuBar::MacGetInstalledMenuBar() == m_menuBar) 
                        {
-                               UMAInsertMenu( pSubMenu->m_hMenu , -1 ) ;
+                               ::InsertMenu( pSubMenu->m_hMenu , -1 ) ;
                        }
                        
                        if ( pos == (size_t)-1 )
@@ -453,7 +453,7 @@ bool wxMenu::MacMenuSelect( wxEvtHandler* handler, long when , int macMenuId, in
 #ifndef __DARWIN__
        else if ( macMenuId == kHMHelpMenuID )
        {
-               int menuItem = formerHelpMenuItems ;
+               int menuItem = firstUserHelpMenuItem-1 ;
          for (pos = 0, node = GetMenuItems().First(); node; node = node->Next(), pos++) 
          {     
                wxMenuItem * pItem = (wxMenuItem *)  node->Data() ;
@@ -639,20 +639,13 @@ void wxMenuBar::MacInstallMenuBar()
        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 (pos = 0 , node = menu->GetMenuItems().First(); node; node = node->Next(), pos++) 
                                {
@@ -667,7 +660,7 @@ void wxMenuBar::MacInstallMenuBar()
                                                if ( item->IsSeparator() )
                                                {
                                                        if ( mh )
-                                                               UMAAppendMenuItem(mh, "\p-" );
+                                                               MacAppendMenu(mh, "\p-" );
                                                }
                                                else
                                                {
@@ -683,7 +676,7 @@ void wxMenuBar::MacInstallMenuBar()
                                                        }
                                                        if ( item->GetId() == wxApp::s_macAboutMenuItemId )
                                                        { 
-                                                                       UMASetMenuItemText( GetMenuHandle( kwxMacAppleMenuId ) , 1 , label );
+                                                                       ::SetMenuItemText( GetMenuHandle( kwxMacAppleMenuId ) , 1 , label );
                                                                        UMAEnableMenuItem( GetMenuHandle( kwxMacAppleMenuId ) , 1 );
                                                        }
                                                        else
@@ -695,53 +688,42 @@ void wxMenuBar::MacInstallMenuBar()
                                        }
                                }
                        }
-#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 ) ;
-                                       
-                               for (pos = 0 , node = menu->GetMenuItems().First(); node; node = node->Next(), pos++) 
-                               {
-                                       item = (wxMenuItem *)node->Data();
-                                       subMenu = item->GetSubMenu() ;
-                                       if (subMenu)                    
-                                       {
-                                               UMAInsertMenu( subMenu->GetHMenu() , -1 ) ;
-                                       }
-                                       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
-                                                       UMASetMenuItemText( GetMenuHandle( kwxMacAppleMenuId ) , 1 , label );
-                                                       UMAEnableMenuItem( GetMenuHandle( kwxMacAppleMenuId ) , 1 );
-                                               }
-                                       }
-                               }
-                               UMAInsertMenu(m_menus[i]->GetHMenu(), 0);
-                       }
-#endif
                        else
                        {
                                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)                    
                                        {
-                                               UMAInsertMenu( subMenu->GetHMenu() , -1 ) ;
+                                         submenus.Add(subMenu) ;
                                        }
                                }
-                               UMAInsertMenu(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 ) ;
+                       }
                        }
                }
-               UMADrawMenuBar() ;
+               ::DrawMenuBar() ;
 
        s_macInstalledMenuBar = this;
 }
@@ -816,18 +798,18 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
     {
                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() ) ;
                                }
                        }
                }