corrected realization of vertical toolbars (were always horizontal)

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

diff --git a/src/mac/menu.cpp b/src/mac/menu.cpp
index 9a66f806d2a33aa0cdb10eba2d5f9afe160aea1c..72be92772dc24aad4d5f5e96b913801b52961148 100644 (file)
--- a/src/mac/menu.cpp
+++ b/src/mac/menu.cpp
@@ -22,8 +22,10 @@
 #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"
 
@@ -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 )
     {
@@ -83,7 +89,7 @@ void wxMenu::Init()
 wxMenu::~wxMenu()
 {
        if (m_hMenu)
-               UMADisposeMenu(m_hMenu);
+               ::DisposeMenu(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() )
@@ -177,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 )
@@ -263,7 +269,7 @@ 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
@@ -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;
 }
@@ -460,6 +450,7 @@ bool wxMenu::MacMenuSelect( wxEvtHandler* handler, long when , int macMenuId, in
                        return true ;
                }
        }
+#ifndef __DARWIN__
        else if ( macMenuId == kHMHelpMenuID )
        {
                int menuItem = formerHelpMenuItems ;
@@ -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" );
@@ -688,7 +683,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
@@ -700,8 +695,37 @@ void wxMenuBar::MacInstallMenuBar()
                                        }
                                }
                        }
-                       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 ) ;
+                                       
+                               for (pos = 0 , node = menu->GetMenuItems().First(); node; node = node->Next(), pos++) 
+                               {
+                                       item = (wxMenuItem *)node->Data();
+                                       subMenu = item->GetSubMenu() ;
+                                       if (subMenu)                    
+                                       {
+                                               ::InsertMenu( 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
+                                                       ::SetMenuItemText( GetMenuHandle( kwxMacAppleMenuId ) , 1 , label );
+                                                       UMAEnableMenuItem( GetMenuHandle( kwxMacAppleMenuId ) , 1 );
+                                               }
+                                       }
+                               }
+                               ::InsertMenu(m_menus[i]->GetHMenu(), 0);
+                       }
 #endif
+                       else
                        {
                                wxMenuItem::MacBuildMenuString( label, NULL , NULL , m_titles[i] , false );
                                UMASetMenuTitle( menu->GetHMenu() , label ) ;
@@ -711,13 +735,13 @@ void wxMenuBar::MacInstallMenuBar()
                                        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;
 }
@@ -792,18 +816,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() ) ;
                                }
                        }
                }
@@ -873,8 +897,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,8 +963,6 @@ bool wxMenuBar::Append(wxMenu *menu, const wxString& title)
     if ( !wxMenuBarBase::Append(menu, title) )
         return FALSE;
 
-    menu->Attach(this);
-
     m_titles.Add(title);
 
     if ( IsAttached() )
@@ -961,11 +986,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();