corrected GetDepth method and wrong disposal calls for pixmap

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

diff --git a/src/mac/menu.cpp b/src/mac/menu.cpp
index 030c20efd000c017f814d03cebbc0e04066cee1a..548f803aab13b2efc73c0d141d528943c1a27a67 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 ;
@@ -88,8 +88,8 @@ void wxMenu::Init()
 
 wxMenu::~wxMenu()
 {
-       if (m_hMenu)
-               ::DisposeMenu(m_hMenu);
+       if (MAC_WXHMENU(m_hMenu))
+               ::DisposeMenu(MAC_WXHMENU(m_hMenu));
 
 #if wxUSE_ACCEL
     // delete accels
@@ -164,11 +164,11 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
        {
                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 
@@ -183,16 +183,16 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
                
                        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
@@ -209,21 +209,21 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
                        }
                        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 ) ;
                                }
                        }
                }
@@ -274,7 +274,7 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
     //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() )
     {
@@ -312,7 +312,7 @@ void wxMenu::SetTitle(const wxString& label)
        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)
 {
@@ -399,9 +399,9 @@ int wxMenu::MacGetIndexFromItem( wxMenuItem *pItem )
 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() ;
 }
@@ -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
                                                {
@@ -695,59 +688,10 @@ 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 ) ;
-                                       
-                                       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++) 
@@ -759,7 +703,7 @@ void wxMenuBar::MacInstallMenuBar()
                                          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] ;
@@ -775,7 +719,7 @@ void wxMenuBar::MacInstallMenuBar()
                                                submenus.Add(itsSubMenu) ;
                                        }                               
                                }
-                                       ::InsertMenu( submenu->GetHMenu() , -1 ) ;
+                                       ::InsertMenu( MAC_WXHMENU(submenu->GetHMenu()) , -1 ) ;
                        }
                        }
                }
@@ -858,14 +802,14 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
                        {
                                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() ) ;
                                }
                        }
                }
@@ -892,17 +836,19 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
 
     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
@@ -1002,13 +948,17 @@ bool wxMenuBar::Append(wxMenu *menu, const wxString& title)
         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() )