]> git.saurik.com Git - wxWidgets.git/blobdiff - src/mac/menu.cpp
removing dependancy on mac headers from public wx headers (eventually adding wx/mac...
[wxWidgets.git] / src / mac / menu.cpp
index 9a66f806d2a33aa0cdb10eba2d5f9afe160aea1c..17e8679a5b085b4b117bb69fd553e999d87fb751 100644 (file)
 #pragma implementation "menuitem.h"
 #endif
 
+#include "wx/app.h"
 #include "wx/menu.h"
 #include "wx/menuitem.h"
+#include "wx/window.h"
 #include "wx/log.h"
 #include "wx/utils.h"
 
@@ -40,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 ;
@@ -54,7 +56,11 @@ const short kwxMacAppleMenuId = 1 ;
 
 // Construct a menu with optional title (then use append)
 
+#ifdef __DARWIN__
+short wxMenu::s_macNextMenuId = 3 ;
+#else
 short wxMenu::s_macNextMenuId = 2 ;
+#endif
 
 void wxMenu::Init()
 {
@@ -65,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 )
     {
@@ -82,8 +88,8 @@ void wxMenu::Init()
 
 wxMenu::~wxMenu()
 {
-       if (m_hMenu)
-               UMADisposeMenu(m_hMenu);
+       if (MAC_WXHMENU(m_hMenu))
+               ::DisposeMenu(MAC_WXHMENU(m_hMenu));
 
 #if wxUSE_ACCEL
     // delete accels
@@ -134,7 +140,7 @@ void wxMenu::UpdateAccel(wxMenuItem *item)
         if ( accel )
             m_accels[n] = accel;
         else
-            m_accels.Remove(n);
+            m_accels.RemoveAt(n);
     }
 
     if ( IsAttached() )
@@ -158,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 
@@ -177,16 +183,16 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
                
                        if (wxMenuBar::MacGetInstalledMenuBar() == m_menuBar) 
                        {
-                               UMAInsertMenu( 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
@@ -203,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 ) ;
                                }
                        }
                }
@@ -263,12 +269,12 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
     {
         delete m_accels[n];
 
-        m_accels.Remove(n);
+        m_accels.RemoveAt(n);
     }
     //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() )
     {
@@ -306,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)
 {
@@ -341,28 +347,12 @@ bool wxMenu::ProcessCommand(wxCommandEvent & event)
 // other
 // ---------------------------------------------------------------------------
 
-void wxMenu::Attach(wxMenuBar *menubar)
-{
-    // menu can be in at most one menubar because otherwise they would both
-    // delete the menu pointer
-    wxASSERT_MSG( !m_menuBar, wxT("menu belongs to 2 menubars, expect a crash") );
-
-    m_menuBar = menubar;
-}
-
-void wxMenu::Detach()
-{
-    wxASSERT_MSG( m_menuBar, wxT("can't detach menu if it's not attached") );
-
-    m_menuBar = NULL;
-}
-
 wxWindow *wxMenu::GetWindow() const
 {
     if ( m_invokingWindow != NULL )
         return m_invokingWindow;
     else if ( m_menuBar != NULL)
-        return m_menuBar->GetFrame();
+        return (wxWindow *) m_menuBar->GetFrame();
 
     return NULL;
 }
@@ -409,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() ;
 }
@@ -460,9 +450,10 @@ bool wxMenu::MacMenuSelect( wxEvtHandler* handler, long when , int macMenuId, in
                        return true ;
                }
        }
+#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() ;
@@ -508,6 +499,7 @@ bool wxMenu::MacMenuSelect( wxEvtHandler* handler, long when , int macMenuId, in
                        }
          }
        }
+#endif // __DARWIN__
 
   for (pos = 0, node = GetMenuItems().First(); node; node = node->Next(), pos++) 
   {    
@@ -627,6 +619,9 @@ void wxMenuBar::RebuildAccelTable()
 
 void wxMenuBar::MacInstallMenuBar() 
 {
+       if ( s_macInstalledMenuBar == this )
+               return ;
+               
        Handle menubar = ::GetNewMBar( kwxMacMenuBarResource ) ;
        wxString message ;
        wxCHECK_RET( menubar != NULL, "can't read MBAR resource" );
@@ -644,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++) 
                                {
@@ -672,7 +660,7 @@ void wxMenuBar::MacInstallMenuBar()
                                                if ( item->IsSeparator() )
                                                {
                                                        if ( mh )
-                                                               UMAAppendMenuItem(mh, "\p-" );
+                                                               MacAppendMenu(mh, "\p-" );
                                                }
                                                else
                                                {
@@ -688,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
@@ -701,23 +689,41 @@ void wxMenuBar::MacInstallMenuBar()
                                }
                        }
                        else
-#endif
                        {
                                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++) 
                                {
                                        item = (wxMenuItem *)node->Data();
                                        subMenu = item->GetSubMenu() ;
                                        if (subMenu)                    
                                        {
-                                               UMAInsertMenu( subMenu->GetHMenu() , -1 ) ;
+                                         submenus.Add(subMenu) ;
                                        }
                                }
-                               UMAInsertMenu(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] ;
+               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( MAC_WXHMENU(submenu->GetHMenu()) , -1 ) ;
+                       }
                        }
                }
-               UMADrawMenuBar() ;
+               ::DrawMenuBar() ;
 
        s_macInstalledMenuBar = this;
 }
@@ -792,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 ) ;
+                               UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , label ) ;
                                if ( pos == m_menus.GetCount() - 1)
                                {
-                                       UMAInsertMenu( menu->GetHMenu() , 0 ) ;
+                                       ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , 0 ) ;
                                }
                                else
                                {
-                                       UMAInsertMenu( menu->GetHMenu() , m_menus[pos+1]->MacGetMenuId() ) ;
+                                       ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , m_menus[pos+1]->MacGetMenuId() ) ;
                                }
                        }
                }
@@ -836,11 +842,11 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
     {
        if ( pos == (size_t) -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() ) ;
                }
 
 #if wxUSE_ACCEL
@@ -873,8 +879,11 @@ void wxMenuBar::MacMenuSelect(wxEvtHandler* handler, long when , int macMenuId,
        {               
          for (int i = 0; i < m_menus.GetCount() ; i++)
          {
-               if ( m_menus[i]->MacGetMenuId() == macMenuId || 
+               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 ) )
@@ -936,15 +945,13 @@ bool wxMenuBar::Append(wxMenu *menu, const wxString& title)
     if ( !wxMenuBarBase::Append(menu, title) )
         return FALSE;
 
-    menu->Attach(this);
-
     m_titles.Add(title);
 
     if ( IsAttached() )
     {
                if (s_macInstalledMenuBar == this)
                {
-                       ::InsertMenu( menu->GetHMenu() , 0 ) ;
+                       ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , 0 ) ;
                }
 
 #if wxUSE_ACCEL
@@ -961,11 +968,14 @@ bool wxMenuBar::Append(wxMenu *menu, const wxString& title)
     return TRUE;
 }
 
-void wxMenuBar::Attach(wxFrame *frame)
+void wxMenuBar::Detach()
 {
-//    wxASSERT_MSG( !IsAttached(), wxT("menubar already attached!") );
+    wxMenuBarBase::Detach() ;
+}
 
-    m_menuBarFrame = frame;
+void wxMenuBar::Attach(wxFrame *frame)
+{
+    wxMenuBarBase::Attach( frame ) ;
 
 #if wxUSE_ACCEL
     RebuildAccelTable();