X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9576ca53db96b462ed4c0b4bdf47d64c40203e4..e11898f903183f897a2b2a50a4447ea73ba7273f:/src/mac/carbon/menu.cpp

diff --git a/src/mac/carbon/menu.cpp b/src/mac/carbon/menu.cpp
index 1fc7c4a229..1aab98b958 100644
--- a/src/mac/carbon/menu.cpp
+++ b/src/mac/carbon/menu.cpp
@@ -1,31 +1,35 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        menu.cpp
 // Purpose:     wxMenu, wxMenuBar, wxMenuItem
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#ifdef __GNUG__
+#pragma implementation "menu.h"
+#pragma implementation "menuitem.h"
+#endif
 
 // ============================================================================
 // headers & declarations
 // ============================================================================
 
-// wxWindows headers
+// wxWidgets headers
 // -----------------
 
-#ifdef __GNUG__
-#pragma implementation "menu.h"
-#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"
+#include "wx/frame.h"
+
+#include "wx/mac/uma.h"
 
 // other standard headers
 // ----------------------
@@ -36,536 +40,886 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler)
 IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler)
 #endif
 
+// the (popup) menu title has this special id
+static const int idMenuTitle = -3;
+static MenuItemIndex firstUserHelpMenuItem = 0 ;
+
+const short kwxMacMenuBarResource = 1 ;
+const short kwxMacAppleMenuId = 1 ;
+
+
+// Find an item given the Macintosh Menu Reference
+
+wxList wxWinMacMenuList(wxKEY_INTEGER);
+wxMenu *wxFindMenuFromMacMenu(MenuRef inMenuRef)
+{
+    wxNode *node = wxWinMacMenuList.Find((long)inMenuRef);
+    if (!node)
+        return NULL;
+    return (wxMenu *)node->GetData();
+}
+
+void wxAssociateMenuWithMacMenu(MenuRef inMenuRef, wxMenu *menu) ;
+void wxAssociateMenuWithMacMenu(MenuRef inMenuRef, wxMenu *menu)
+{
+    // adding NULL MenuRef is (first) surely a result of an error and
+    // (secondly) breaks menu command processing
+    wxCHECK_RET( inMenuRef != (MenuRef) NULL, wxT("attempt to add a NULL MenuRef to menu list") );
+
+    if ( !wxWinMacMenuList.Find((long)inMenuRef) )
+        wxWinMacMenuList.Append((long)inMenuRef, menu);
+}
+
+void wxRemoveMacMenuAssociation(wxMenu *menu) ;
+void wxRemoveMacMenuAssociation(wxMenu *menu)
+{
+    wxWinMacMenuList.DeleteObject(menu);
+}
+
+
 // ============================================================================
 // implementation
 // ============================================================================
+static void wxMenubarUnsetInvokingWindow( wxMenu *menu ) ;
+static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win );
 
 // Menus
 
 // Construct a menu with optional title (then use append)
-wxMenu::wxMenu(const wxString& title, const wxFunction func)
+
+#ifdef __DARWIN__
+short wxMenu::s_macNextMenuId = 3 ;
+#else
+short wxMenu::s_macNextMenuId = 2 ;
+#endif
+
+void wxMenu::Init()
 {
-    m_title = title;
-    m_parent = NULL;
-    m_eventHandler = this;
-    m_noItems = 0;
-    m_menuBar = NULL;
-    m_clientData = (void*) NULL;
-    if (m_title != "")
+    m_doBreak = FALSE;
+    m_startRadioGroup = -1;
+
+    // create the menu
+    m_macMenuId = s_macNextMenuId++;
+    m_hMenu = UMANewMenu(m_macMenuId, m_title, wxFont::GetDefaultEncoding() );
+
+    if ( !m_hMenu )
     {
-        Append(-2, m_title) ;
-        AppendSeparator() ;
+        wxLogLastError(wxT("UMANewMenu failed"));
     }
 
-    Callback(func);
+    wxAssociateMenuWithMacMenu( (MenuRef)m_hMenu , this ) ;
 
-    // TODO create menu
+    // if we have a title, insert it in the beginning of the menu
+    if ( !!m_title )
+    {
+        Append(idMenuTitle, m_title) ;
+        AppendSeparator() ;
+    }
 }
 
-// The wxWindow destructor will take care of deleting the submenus.
 wxMenu::~wxMenu()
 {
-    // TODO destroy menu and children
-
-    wxNode *node = m_menuItems.First();
-    while (node)
-    {
-        wxMenuItem *item = (wxMenuItem *)node->Data();
-
-        // Delete child menus.
-        // Beware: they must not be appended to children list!!!
-        // (because order of delete is significant)
-        if (item->GetSubMenu())
-            item->DeleteSubMenu();
-
-        wxNode *next = node->Next();
-        delete item;
-        delete node;
-        node = next;
-    }
+    wxRemoveMacMenuAssociation( this ) ;
+    if (MAC_WXHMENU(m_hMenu))
+        ::DisposeMenu(MAC_WXHMENU(m_hMenu));
 }
 
 void wxMenu::Break()
 {
-    // TODO
+    // not available on the mac platform
 }
 
-// function appends a new item or submenu to the menu
-void wxMenu::Append(wxMenuItem *pItem)
+void wxMenu::Attach(wxMenuBarBase *menubar)
 {
-    // TODO
-
-    wxCHECK_RET( pItem != NULL, "can't append NULL item to the menu" );
+    wxMenuBase::Attach(menubar);
 
-    m_menuItems.Append(pItem);
-
-    m_noItems++;
+    EndRadioGroup();
 }
 
-void wxMenu::AppendSeparator()
+// function appends a new item or submenu to the menu
+// append a new item or submenu to the menu
+bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
 {
-    // TODO
-    Append(new wxMenuItem(this, ID_SEPARATOR));
-}
+    wxASSERT_MSG( pItem != NULL, wxT("can't append NULL item to the menu") );
 
-// Pullright item
-void wxMenu::Append(int Id, const wxString& label, wxMenu *SubMenu, 
-                    const wxString& helpString)
-{
-    Append(new wxMenuItem(this, Id, label, helpString, FALSE, SubMenu));
+    if ( pItem->IsSeparator() )
+    {
+        if ( pos == (size_t)-1 )
+            MacAppendMenu(MAC_WXHMENU(m_hMenu), "\p-");
+        else
+            MacInsertMenuItem(MAC_WXHMENU(m_hMenu), "\p-" , pos);
+    }
+    else
+    {
+        wxMenu *pSubMenu = pItem->GetSubMenu() ;
+        if ( pSubMenu != NULL )
+        {
+               wxASSERT_MSG( pSubMenu->m_hMenu != NULL , wxT("invalid submenu added"));
+            pSubMenu->m_menuParent = this ;
+
+            if (wxMenuBar::MacGetInstalledMenuBar() == GetMenuBar())
+            {
+                pSubMenu->MacBeforeDisplay( true ) ;
+             }
+
+            if ( pos == (size_t)-1 )
+                UMAAppendSubMenuItem(MAC_WXHMENU(m_hMenu), pItem->GetText(), wxFont::GetDefaultEncoding() , pSubMenu->m_macMenuId);
+            else
+                UMAInsertSubMenuItem(MAC_WXHMENU(m_hMenu), pItem->GetText(), wxFont::GetDefaultEncoding()  , pos, pSubMenu->m_macMenuId);
+            pItem->UpdateItemBitmap() ;
+            pItem->UpdateItemStatus() ;
+        }
+        else
+        {
+            if ( pos == (size_t)-1 )
+            {
+                UMAAppendMenuItem(MAC_WXHMENU(m_hMenu), wxT("a") , wxFont::GetDefaultEncoding() );
+                pos = CountMenuItems(MAC_WXHMENU(m_hMenu)) ;
+            }
+            else
+            {
+                // MacOS counts menu items from 1 and inserts after, therefore having the
+                // same effect as wx 0 based and inserting before, we must correct pos
+                // after however for updates to be correct
+                UMAInsertMenuItem(MAC_WXHMENU(m_hMenu), wxT("a"), wxFont::GetDefaultEncoding(), pos);
+                pos += 1 ;
+            }
+
+            SetMenuItemCommandID( MAC_WXHMENU(m_hMenu) , pos , pItem->GetId() ) ;
+            SetMenuItemRefCon( MAC_WXHMENU(m_hMenu) , pos , (UInt32) pItem ) ;
+            pItem->UpdateItemText() ;
+            pItem->UpdateItemBitmap() ;
+            pItem->UpdateItemStatus() ;
+
+              if ( pItem->GetId() == idMenuTitle )
+              {
+                UMAEnableMenuItem(MAC_WXHMENU(m_hMenu) , pos , false ) ;
+              }
+        }
+    }
+    // if we're already attached to the menubar, we must update it
+    if ( IsAttached() )
+    {
+        GetMenuBar()->Refresh();
+    }
+    return TRUE ;
 }
 
-// Ordinary menu item
-void wxMenu::Append(int Id, const wxString& label, 
-                    const wxString& helpString, bool checkable)
+void wxMenu::EndRadioGroup()
 {
-  // 'checkable' parameter is useless for Windows.
-    Append(new wxMenuItem(this, Id, label, helpString, checkable));
+    // we're not inside a radio group any longer
+    m_startRadioGroup = -1;
 }
 
-void wxMenu::Delete(int id)
+wxMenuItem* wxMenu::DoAppend(wxMenuItem *item)
 {
-    wxNode *node;
-    wxMenuItem *item;
-    int pos;
+    wxCHECK_MSG( item, NULL, _T("NULL item in wxMenu::DoAppend") );
+
+    bool check = FALSE;
+
+    if ( item->GetKind() == wxITEM_RADIO )
+    {
+        int count = GetMenuItemCount();
+
+        if ( m_startRadioGroup == -1 )
+        {
+            // start a new radio group
+            m_startRadioGroup = count;
+
+            // for now it has just one element
+            item->SetAsRadioGroupStart();
+            item->SetRadioGroupEnd(m_startRadioGroup);
 
-    for (pos = 0, node = m_menuItems.First(); node; node = node->Next(), pos++) {
-	 item = (wxMenuItem *)node->Data();
-	 if (item->GetId() == id)
-		break;
+            // ensure that we have a checked item in the radio group
+            check = TRUE;
+        }
+        else // extend the current radio group
+        {
+            // we need to update its end item
+            item->SetRadioGroupStart(m_startRadioGroup);
+            wxMenuItemList::Node *node = GetMenuItems().Item(m_startRadioGroup);
+
+            if ( node )
+            {
+                node->GetData()->SetRadioGroupEnd(count);
+            }
+            else
+            {
+                wxFAIL_MSG( _T("where is the radio group start item?") );
+            }
+        }
+    }
+    else // not a radio item
+    {
+        EndRadioGroup();
     }
 
-    if (!node)
-	return;
+    if ( !wxMenuBase::DoAppend(item) || !DoInsertOrAppend(item) )
+    {
+        return NULL;
+    }
 
-    m_menuItems.DeleteNode(node);
-    delete item;
+    if ( check )
+    {
+        // check the item initially
+        item->Check(TRUE);
+    }
 
-    // TODO
+    return item;
 }
 
-void wxMenu::Enable(int Id, bool Flag)
+wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item)
 {
-    wxMenuItem *item = FindItemForId(Id);
-    wxCHECK_RET( item != NULL, "can't enable non-existing menu item" );
-
-    item->Enable(Flag);
+    if (wxMenuBase::DoInsert(pos, item) && DoInsertOrAppend(item, pos))
+        return item;
+    else
+        return NULL;
 }
 
-bool wxMenu::Enabled(int Id) const
+wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
 {
-    wxMenuItem *item = FindItemForId(Id);
-    wxCHECK( item != NULL, FALSE );
+    // we need to find the items position in the child list
+    size_t pos;
+    wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+    for ( pos = 0; node; pos++ )
+    {
+        if ( node->GetData() == item )
+            break;
 
-    return item->IsEnabled();
-}
+        node = node->GetNext();
+    }
 
-void wxMenu::Check(int Id, bool Flag)
-{
-    wxMenuItem *item = FindItemForId(Id);
-    wxCHECK_RET( item != NULL, "can't get status of non-existing menu item" );
+    // DoRemove() (unlike Remove) can only be called for existing item!
+    wxCHECK_MSG( node, NULL, wxT("bug in wxMenu::Remove logic") );
 
-    item->Check(Flag);
-}
+    ::DeleteMenuItem(MAC_WXHMENU(m_hMenu) , pos + 1);
 
-bool wxMenu::Checked(int Id) const
-{
-    wxMenuItem *item = FindItemForId(Id);
-    wxCHECK( item != NULL, FALSE );
+    if ( IsAttached() )
+    {
+        // otherwise, the change won't be visible
+        GetMenuBar()->Refresh();
+    }
 
-    return item->IsChecked();
+    // and from internal data structures
+    return wxMenuBase::DoRemove(item);
 }
 
 void wxMenu::SetTitle(const wxString& label)
 {
-    m_title = label ;
-    // TODO
+       m_title = label ;
+    UMASetMenuTitle(MAC_WXHMENU(m_hMenu) , label , wxFont::GetDefaultEncoding() ) ;
 }
-
-const wxString wxMenu::GetTitle() const
+bool wxMenu::ProcessCommand(wxCommandEvent & event)
 {
-    return m_title;
+    bool processed = FALSE;
+
+    // Try the menu's event handler
+    if ( !processed && GetEventHandler())
+    {
+        processed = GetEventHandler()->ProcessEvent(event);
+    }
+
+    // Try the window the menu was popped up from (and up through the
+    // hierarchy)
+    wxWindow *win = GetInvokingWindow();
+    if ( !processed && win )
+        processed = win->GetEventHandler()->ProcessEvent(event);
+
+    return processed;
 }
 
-void wxMenu::SetLabel(int id, const wxString& label)
+
+// ---------------------------------------------------------------------------
+// other
+// ---------------------------------------------------------------------------
+
+wxWindow *wxMenu::GetWindow() const
 {
-    wxMenuItem *item = FindItemForId(id) ;
-    if (item==NULL)
-        return;
+    if ( m_invokingWindow != NULL )
+        return m_invokingWindow;
+    else if ( GetMenuBar() != NULL)
+        return (wxWindow *) GetMenuBar()->GetFrame();
 
-    if (item->GetSubMenu()==NULL)
+    return NULL;
+}
+
+// helper functions returning the mac menu position for a certain item, note that this is
+// mac-wise 1 - based, i.e. the first item has index 1 whereas on MSWin it has pos 0
+
+int wxMenu::MacGetIndexFromId( int id )
+{
+    size_t pos;
+    wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+    for ( pos = 0; node; pos++ )
     {
-        // TODO
+        if ( node->GetData()->GetId() == id )
+            break;
+
+        node = node->GetNext();
     }
-    else
+
+    if (!node)
+        return 0;
+
+    return pos + 1 ;
+}
+
+int wxMenu::MacGetIndexFromItem( wxMenuItem *pItem )
+{
+    size_t pos;
+    wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+    for ( pos = 0; node; pos++ )
     {
-        // TODO
+        if ( node->GetData() == pItem )
+            break;
+
+        node = node->GetNext();
     }
-    item->SetName(label);
+
+    if (!node)
+        return 0;
+
+    return pos + 1 ;
 }
 
-wxString wxMenu::GetLabel(int Id) const
+void wxMenu::MacEnableMenu( bool bDoEnable )
 {
-    // TODO
-    return wxString("") ;
+    UMAEnableMenuItem(MAC_WXHMENU(m_hMenu) , 0 , bDoEnable ) ;
+
+    ::DrawMenuBar() ;
 }
 
-// Finds the item id matching the given string, -1 if not found.
-int wxMenu::FindItem (const wxString& itemString) const
+// MacOS needs to know about submenus somewhere within this menu
+// before it can be displayed , also hide special menu items like preferences
+// that are handled by the OS
+void wxMenu::MacBeforeDisplay( bool isSubMenu )
 {
-    char buf1[200];
-    char buf2[200];
-    wxStripMenuCodes ((char *)(const char *)itemString, buf1);
-
-    for (wxNode * node = m_menuItems.First (); node; node = node->Next ())
+    wxMenuItem* previousItem = NULL ;
+    size_t pos ;
+    wxMenuItemList::Node *node;
+    wxMenuItem *item;
+    for (pos = 0, node = GetMenuItems().GetFirst(); node; node = node->GetNext(), pos++)
     {
-      wxMenuItem *item = (wxMenuItem *) node->Data ();
-      if (item->GetSubMenu())
-      {
-        int ans = item->GetSubMenu()->FindItem(itemString);
-        if (ans > -1)
-          return ans;
-      }
-      if ( !item->IsSeparator() )
-      {
-        wxStripMenuCodes((char *)item->GetName().c_str(), buf2);
-        if (strcmp(buf1, buf2) == 0)
-          return item->GetId();
-      }
+        item = (wxMenuItem *)node->GetData();
+        wxMenu* subMenu = item->GetSubMenu() ;
+        if (subMenu)
+        {
+            subMenu->MacBeforeDisplay( true ) ;
+        }
+        else
+        {
+            #if TARGET_CARBON
+            if ( UMAGetSystemVersion() >= 0x1000 )
+            {
+                if ( item->GetId() == wxApp::s_macPreferencesMenuItemId || item->GetId() == wxApp::s_macExitMenuItemId)
+                {
+                    ChangeMenuItemAttributes( MAC_WXHMENU( GetHMenu() ) , pos + 1, kMenuItemAttrHidden, 0 );
+                    if ( GetMenuItems().GetCount() == pos + 1 &&
+                            previousItem != NULL &&
+                                previousItem->IsSeparator() )
+                    {
+                        ChangeMenuItemAttributes( MAC_WXHMENU( GetHMenu() ) , pos , kMenuItemAttrHidden, 0 );
+                    }
+                }
+            }
+            #endif
+        }
+        previousItem = item ;
     }
 
-    return -1;
-}
+    if ( isSubMenu )
+        ::InsertMenu(MAC_WXHMENU( GetHMenu()), -1);
 
-wxMenuItem *wxMenu::FindItemForId(int itemId, wxMenu ** itemMenu) const
+}
+// undo all changes from the MacBeforeDisplay call
+void wxMenu::MacAfterDisplay( bool isSubMenu )
 {
-    if (itemMenu)
-        *itemMenu = NULL;
-    for (wxNode * node = m_menuItems.First (); node; node = node->Next ())
-    {
-        wxMenuItem *item = (wxMenuItem *) node->Data ();
+    if ( isSubMenu )
+        ::DeleteMenu(MacGetMenuId());
 
-        if (item->GetId() == itemId)
+    wxMenuItem* previousItem = NULL ;
+    int pos ;
+    wxMenuItemList::Node *node;
+    wxMenuItem *item;
+    for (pos = 0, node = GetMenuItems().GetFirst(); node; node = node->GetNext(), pos++)
+    {
+        item = (wxMenuItem *)node->GetData();
+        wxMenu* subMenu = item->GetSubMenu() ;
+        if (subMenu)
         {
-            if (itemMenu)
-                *itemMenu = (wxMenu *) this;
-            return item;
+            subMenu->MacAfterDisplay( true ) ;
         }
-
-        if (item->GetSubMenu())
+        else
         {
-            wxMenuItem *ans = item->GetSubMenu()->FindItemForId (itemId, itemMenu);
-            if (ans)
-                return ans;
+            // no need to undo hidings
         }
+        previousItem = item ;
     }
+}
 
-    if (itemMenu)
-        *itemMenu = NULL;
-    return NULL;
+// Menu Bar
+
+/*
+
+Mac Implementation note :
+
+The Mac has only one global menubar, so we attempt to install the currently
+active menubar from a frame, we currently don't take into account mdi-frames
+which would ask for menu-merging
+
+Secondly there is no mac api for changing a menubar that is not the current
+menubar, so we have to wait for preparing the actual menubar until the
+wxMenubar is to be used
+
+We can in subsequent versions use MacInstallMenuBar to provide some sort of
+auto-merge for MDI in case this will be necessary
+
+*/
+
+wxMenuBar* wxMenuBar::s_macInstalledMenuBar = NULL ;
+wxMenuBar* wxMenuBar::s_macCommonMenuBar = NULL ;
+
+void wxMenuBar::Init()
+{
+    m_eventHandler = this;
+    m_menuBarFrame = NULL;
+    m_invokingWindow = (wxWindow*) NULL;
 }
 
-void wxMenu::SetHelpString(int itemId, const wxString& helpString)
+wxMenuBar::wxMenuBar()
 {
-    wxMenuItem *item = FindItemForId (itemId);
-    if (item)
-        item->SetHelp(helpString);
+    Init();
 }
 
-wxString wxMenu::GetHelpString (int itemId) const
+wxMenuBar::wxMenuBar( long WXUNUSED(style) )
 {
-    wxMenuItem *item = FindItemForId (itemId);
-    wxString str("");
-    return (item == NULL) ? str : item->GetHelp();
+    Init();
 }
 
-void wxMenu::ProcessCommand(wxCommandEvent & event)
+
+wxMenuBar::wxMenuBar(int count, wxMenu *menus[], const wxString titles[])
 {
-    bool processed = FALSE;
+    Init();
 
-    // Try a callback
-    if (m_callback)
+    m_titles.Alloc(count);
+
+    for ( int i = 0; i < count; i++ )
     {
-            (void) (*(m_callback)) (*this, event);
-            processed = TRUE;
+        m_menus.Append(menus[i]);
+        m_titles.Add(titles[i]);
+
+        menus[i]->Attach(this);
     }
+}
 
-    // Try the menu's event handler
-    if ( !processed && GetEventHandler())
+wxMenuBar::~wxMenuBar()
+{
+    if (s_macCommonMenuBar == this)
+        s_macCommonMenuBar = NULL;
+    if (s_macInstalledMenuBar == this)
     {
-            processed = GetEventHandler()->ProcessEvent(event);
+        ::ClearMenuBar();
+        s_macInstalledMenuBar = NULL;
     }
-/* TODO
-    // Try the window the menu was popped up from (and up
-    // through the hierarchy)
-    if ( !processed && GetInvokingWindow())
-        processed = GetInvokingWindow()->ProcessEvent(event);
-*/
+
 }
 
-bool wxWindow::PopupMenu(wxMenu *menu, int x, int y)
+void wxMenuBar::Refresh(bool WXUNUSED(eraseBackground), const wxRect *WXUNUSED(rect))
 {
-    // TODO
-    return FALSE;
+    wxCHECK_RET( IsAttached(), wxT("can't refresh unatteched menubar") );
+
+    DrawMenuBar();
 }
 
-// Menu Bar
-wxMenuBar::wxMenuBar()
+void wxMenuBar::MacInstallMenuBar()
 {
-    m_eventHandler = this;
-    m_menuCount = 0;
-    m_menus = NULL;
-    m_titles = NULL;
-    m_menuBarFrame = NULL;
+    if ( s_macInstalledMenuBar == this )
+        return ;
 
-    // TODO
+    MenuBarHandle menubar = NULL ;
+#if TARGET_API_MAC_OSX
+    menubar = NewHandleClear( 6 /* sizeof( MenuBarHeader ) */ ) ;
+#else
+    menubar = NewHandleClear( 12 ) ;
+    (*menubar)[3] = 0x0a ;
+#endif
+    ::SetMenuBar( menubar ) ;
+    DisposeMenuBar( menubar ) ;
+    MenuHandle appleMenu = NULL ;
+    char appleMenuTitle[3] = { 01 , kMenuAppleLogoFilledGlyph , 0 } ;
+
+    verify_noerr( CreateNewMenu( kwxMacAppleMenuId , 0 , &appleMenu ) ) ;
+    verify_noerr( SetMenuTitle( appleMenu , (ConstStr255Param) appleMenuTitle ) );
+    MacInsertMenuItem( appleMenu , "\pAbout..." , 0 ) ;
+    MacInsertMenu( appleMenu , 0 ) ;
+
+    // clean-up the help menu before adding new items
+    MenuHandle mh = NULL ;
+    if ( UMAGetHelpMenu( &mh , &firstUserHelpMenuItem) == noErr )
+    {
+        for ( int i = CountMenuItems( mh ) ; i >= firstUserHelpMenuItem ; --i )
+        {
+            DeleteMenuItem( mh , i ) ;
+        }
+    }
+    else
+    {
+        mh = NULL ;
+    }
+#if TARGET_CARBON
+    if ( UMAGetSystemVersion() >= 0x1000 && wxApp::s_macPreferencesMenuItemId)
+    {
+        wxMenuItem *item = FindItem( wxApp::s_macPreferencesMenuItemId , NULL ) ;
+        if ( item == NULL || !(item->IsEnabled()) )
+            DisableMenuCommand( NULL , kHICommandPreferences ) ;
+        else
+            EnableMenuCommand( NULL , kHICommandPreferences ) ;
+    }
+#endif
+       for (size_t i = 0; i < m_menus.GetCount(); i++)
+      {
+        wxMenuItemList::Node *node;
+        wxMenuItem *item;
+        int pos ;
+        wxMenu* menu = m_menus[i] , *subMenu = NULL ;
+
+        if( m_titles[i] == wxT("?") || m_titles[i] == wxT("&?")  || m_titles[i] == wxApp::s_macHelpMenuTitleName )
+        {
+            if ( mh == NULL )
+            {
+                continue ;
+            }
+
+              for (pos = 0 , node = menu->GetMenuItems().GetFirst(); node; node = node->GetNext(), pos++)
+              {
+                 item = (wxMenuItem *)node->GetData();
+                 subMenu = item->GetSubMenu() ;
+                if (subMenu)
+                {
+                    // we don't support hierarchical menus in the help menu yet
+                }
+                else
+                {
+                    if ( item->IsSeparator() )
+                    {
+                        if ( mh )
+                            MacAppendMenu(mh, "\p-" );
+                    }
+                    else
+                    {
+                        wxAcceleratorEntry* entry = wxGetAccelFromString( item->GetText() ) ;
+
+                        if ( item->GetId() == wxApp::s_macAboutMenuItemId )
+                        {
+                                UMASetMenuItemText( GetMenuHandle( kwxMacAppleMenuId ) , 1 , item->GetText() , wxFont::GetDefaultEncoding() );
+                                UMAEnableMenuItem( GetMenuHandle( kwxMacAppleMenuId ) , 1 , true );
+                                SetMenuItemCommandID( GetMenuHandle( kwxMacAppleMenuId ) , 1 , item->GetId() ) ;
+                                SetMenuItemRefCon(GetMenuHandle( kwxMacAppleMenuId ) , 1 , (UInt32)item ) ;
+                                UMASetMenuItemShortcut( GetMenuHandle( kwxMacAppleMenuId ) , 1 , entry ) ;
+                         }
+                        else
+                        {
+                            if ( mh )
+                            {
+                                UMAAppendMenuItem(mh, item->GetText()  , wxFont::GetDefaultEncoding(), entry);
+                                SetMenuItemCommandID( mh , CountMenuItems(mh) , item->GetId() ) ;
+                                SetMenuItemRefCon( mh , CountMenuItems(mh) , (UInt32)item ) ;
+                            }
+                        }
+
+                        delete entry ;
+                    }
+                }
+            }
+        }
+        else
+        {
+            UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , m_titles[i], m_font.GetEncoding()  ) ;
+            m_menus[i]->MacBeforeDisplay(false) ;
+            ::InsertMenu(MAC_WXHMENU(m_menus[i]->GetHMenu()), 0);
+        }
+    }
+    ::DrawMenuBar() ;
+    s_macInstalledMenuBar = this;
 }
 
-wxMenuBar::wxMenuBar(int n, wxMenu *menus[], const wxString titles[])
+void wxMenuBar::EnableTop(size_t pos, bool enable)
 {
-    m_eventHandler = this;
-    m_menuCount = n;
-    m_menus = menus;
-    m_titles = new wxString[n];
-    int i;
-    for ( i = 0; i < n; i++ )
-	m_titles[i] = titles[i];
-    m_menuBarFrame = NULL;
-
-    // TODO
+    wxCHECK_RET( IsAttached(), wxT("doesn't work with unattached menubars") );
+    m_menus[pos]->MacEnableMenu( enable ) ;
+    Refresh();
 }
 
-wxMenuBar::~wxMenuBar()
+bool wxMenuBar::Enable( bool enable)
 {
-    int i;
-    for (i = 0; i < m_menuCount; i++)
+    wxCHECK_MSG( IsAttached(), false, wxT("doesn't work with unattached menubars") );
+    size_t i;
+    for (i = 0; i < GetMenuCount(); i++)
     {
-        delete m_menus[i];
+        EnableTop(i, enable);
     }
-    delete[] m_menus;
-    delete[] m_titles;
-
-    // TODO
+    return true;
 }
 
-// Must only be used AFTER menu has been attached to frame,
-// otherwise use individual menus to enable/disable items
-void wxMenuBar::Enable(int id, bool flag)
+void wxMenuBar::SetLabelTop(size_t pos, const wxString& label)
 {
-    wxMenu *itemMenu = NULL;
-    wxMenuItem *item = FindItemForId(id, &itemMenu) ;
-    if (!item)
+    wxCHECK_RET( pos < GetMenuCount(), wxT("invalid menu index") );
+
+    m_titles[pos] = label;
+
+    if ( !IsAttached() )
+    {
         return;
+    }
 
-    // TODO
+    m_menus[pos]->SetTitle( label ) ;
+    if (wxMenuBar::s_macInstalledMenuBar == this) // are we currently installed ?
+    {
+        ::SetMenuBar( GetMenuBar() ) ;
+        ::InvalMenuBar() ;
+    }
 }
 
-void wxMenuBar::EnableTop(int pos, bool flag)
+wxString wxMenuBar::GetLabelTop(size_t pos) const
 {
-    // TODO
+    wxCHECK_MSG( pos < GetMenuCount(), wxEmptyString,
+                 wxT("invalid menu index in wxMenuBar::GetLabelTop") );
+
+    return m_titles[pos];
 }
 
-// Must only be used AFTER menu has been attached to frame,
-// otherwise use individual menus
-void wxMenuBar::Check(int id, bool flag)
+int wxMenuBar::FindMenu(const wxString& title)
 {
-    wxMenu *itemMenu = NULL;
-    wxMenuItem *item = FindItemForId(id, &itemMenu) ;
-    if (!item)
-        return;
+    wxString menuTitle = wxStripMenuCodes(title);
 
-    if (!item->IsCheckable())
-        return ;
+    size_t count = GetMenuCount();
+    for ( size_t i = 0; i < count; i++ )
+    {
+        wxString title = wxStripMenuCodes(m_titles[i]);
+        if ( menuTitle == title )
+            return i;
+    }
+
+    return wxNOT_FOUND;
 
-    // TODO
 }
 
-bool wxMenuBar::Checked(int id) const
+
+// ---------------------------------------------------------------------------
+// wxMenuBar construction
+// ---------------------------------------------------------------------------
+
+// ---------------------------------------------------------------------------
+// wxMenuBar construction
+// ---------------------------------------------------------------------------
+
+wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
 {
-    wxMenu *itemMenu = NULL;
-    wxMenuItem *item = FindItemForId(id, &itemMenu) ;
-    if (!item)
+    wxMenu *menuOld = wxMenuBarBase::Replace(pos, menu, title);
+    if ( !menuOld )
         return FALSE;
+    m_titles[pos] = title;
 
-    // TODO
-    return FALSE;
+    if ( IsAttached() )
+    {
+        if (s_macInstalledMenuBar == this)
+        {
+            menuOld->MacAfterDisplay( false ) ;
+            ::DeleteMenu( menuOld->MacGetMenuId() /* m_menus[pos]->MacGetMenuId() */ ) ;
+            {
+                menu->MacBeforeDisplay( false ) ;
+                UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , title , m_font.GetEncoding() ) ;
+                if ( pos == m_menus.GetCount() - 1)
+                {
+                    ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , 0 ) ;
+                }
+                else
+                {
+                    ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , m_menus[pos+1]->MacGetMenuId() ) ;
+                }
+            }
+        }
+
+        Refresh();
+    }
+
+    return menuOld;
 }
 
-bool wxMenuBar::Enabled(int id) const
+bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
 {
-    wxMenu *itemMenu = NULL;
-    wxMenuItem *item = FindItemForId(id, &itemMenu) ;
-    if (!item)
+    if ( !wxMenuBarBase::Insert(pos, menu, title) )
         return FALSE;
 
-    // TODO
-    return FALSE ;
-}
-
+    m_titles.Insert(title, pos);
 
-void wxMenuBar::SetLabel(int id, const wxString& label)
-{
-    wxMenu *itemMenu = NULL;
-    wxMenuItem *item = FindItemForId(id, &itemMenu) ;
+    UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , title , m_font.GetEncoding() ) ;
 
-    if (!item)
-        return;
+    if ( IsAttached() && s_macInstalledMenuBar == this )
+    {
+        if (s_macInstalledMenuBar == this)
+        {
+            menu->MacBeforeDisplay( false ) ;
+            if ( pos == (size_t) -1  || pos + 1 == m_menus.GetCount() )
+            {
+                ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , 0 ) ;
+            }
+            else
+            {
+                ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , m_menus[pos+1]->MacGetMenuId() ) ;
+            }
+        }
+        Refresh();
+    }
 
-    // TODO
+    return TRUE;
 }
 
-wxString wxMenuBar::GetLabel(int id) const
+wxMenu *wxMenuBar::Remove(size_t pos)
 {
-    wxMenu *itemMenu = NULL;
-    wxMenuItem *item = FindItemForId(id, &itemMenu) ;
+    wxMenu *menu = wxMenuBarBase::Remove(pos);
+    if ( !menu )
+        return NULL;
 
-    if (!item)
-        return wxString("");
+    if ( IsAttached() )
+    {
+        if (s_macInstalledMenuBar == this)
+        {
+            ::DeleteMenu( menu->MacGetMenuId() /* m_menus[pos]->MacGetMenuId() */ ) ;
+        }
 
-    // TODO
-    return wxString("") ;
-}
+        Refresh();
+    }
 
-void wxMenuBar::SetLabelTop(int pos, const wxString& label)
-{
-    // TODO
-}
+    m_titles.RemoveAt(pos);
 
-wxString wxMenuBar::GetLabelTop(int pos) const
-{
-    // TODO
-    return wxString("");
+    return menu;
 }
 
-bool wxMenuBar::OnDelete(wxMenu *a_menu, int pos)
+bool wxMenuBar::Append(wxMenu *menu, const wxString& title)
 {
-    // TODO
-    return FALSE;
-}
+    WXHMENU submenu = menu ? menu->GetHMenu() : 0;
+    wxCHECK_MSG( submenu, FALSE, wxT("can't append invalid menu to menubar") );
 
-bool wxMenuBar::OnAppend(wxMenu *a_menu, const char *title)
-{
-    // TODO
-    return FALSE;
-}
+    if ( !wxMenuBarBase::Append(menu, title) )
+        return FALSE;
 
-void wxMenuBar::Append (wxMenu * menu, const wxString& title)
-{
-    if (!OnAppend(menu, title))
-        return;
+    m_titles.Add(title);
 
-    m_menuCount ++;
-    wxMenu **new_menus = new wxMenu *[m_menuCount];
-    wxString *new_titles = new wxString[m_menuCount];
-    int i;
+    UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , title , m_font.GetEncoding() ) ;
 
-    for (i = 0; i < m_menuCount - 1; i++)
-	{
-        new_menus[i] = m_menus[i];
-        m_menus[i] = NULL;
-        new_titles[i] = m_titles[i];
-        m_titles[i] = "";
-    }
-    if (m_menus)
+    if ( IsAttached() )
     {
-        delete[]m_menus;
-        delete[]m_titles;
+        if (s_macInstalledMenuBar == this)
+        {
+            ::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , 0 ) ;
+        }
+
+        Refresh();
     }
-    m_menus = new_menus;
-    m_titles = new_titles;
 
-    m_menus[m_menuCount - 1] = (wxMenu *)menu;
-    m_titles[m_menuCount - 1] = title;
+   // m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables
+    // adding menu later on.
+    if (m_invokingWindow)
+        wxMenubarSetInvokingWindow( menu, m_invokingWindow );
 
-    // TODO
+    return TRUE;
 }
 
-void wxMenuBar::Delete(wxMenu * menu, int i)
+static void wxMenubarUnsetInvokingWindow( wxMenu *menu )
 {
-    int j;
-    int ii = (int) i;
+    menu->SetInvokingWindow( (wxWindow*) NULL );
 
-    if (menu != 0)
-    {
-	    for (ii = 0; ii < m_menuCount; ii++)
-        {
-            if (m_menus[ii] == menu)
-            break;
-	    }
-        if (ii >= m_menuCount)
-            return;
-    } else
+    wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();
+    while (node)
     {
-        if (ii < 0 || ii >= m_menuCount)
-            return;
-        menu = m_menus[ii];
+        wxMenuItem *menuitem = node->GetData();
+        if (menuitem->IsSubMenu())
+            wxMenubarUnsetInvokingWindow( menuitem->GetSubMenu() );
+        node = node->GetNext();
     }
+}
 
-    if (!OnDelete(menu, ii))
-        return;
+static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win )
+{
+    menu->SetInvokingWindow( win );
 
-    menu->SetParent(NULL);
+    wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();
+    while (node)
+    {
+        wxMenuItem *menuitem = node->GetData();
+        if (menuitem->IsSubMenu())
+            wxMenubarSetInvokingWindow( menuitem->GetSubMenu() , win );
+        node = node->GetNext();
+    }
+}
 
-    -- m_menuCount;
-    for (j = ii; j < m_menuCount; j++)
+void wxMenuBar::UnsetInvokingWindow()
+{
+    m_invokingWindow = (wxWindow*) NULL;
+    wxMenuList::Node *node = m_menus.GetFirst();
+    while (node)
     {
-        m_menus[j] = m_menus[j + 1];
-        m_titles[j] = m_titles[j + 1];
+        wxMenu *menu = node->GetData();
+        wxMenubarUnsetInvokingWindow( menu );
+        node = node->GetNext();
     }
 }
 
-// Find the menu menuString, item itemString, and return the item id.
-// Returns -1 if none found.
-int wxMenuBar::FindMenuItem (const wxString& menuString, const wxString& itemString) const
+void wxMenuBar::SetInvokingWindow(wxFrame *frame)
 {
-    char buf1[200];
-    char buf2[200];
-    wxStripMenuCodes ((char *)(const char *)menuString, buf1);
-    int i;
-    for (i = 0; i < m_menuCount; i++)
+    m_invokingWindow = frame;
+    wxMenuList::Node *node = m_menus.GetFirst();
+    while (node)
     {
-        wxStripMenuCodes ((char *)(const char *)m_titles[i], buf2);
-        if (strcmp (buf1, buf2) == 0)
-            return m_menus[i]->FindItem (itemString);
+        wxMenu *menu = node->GetData();
+        wxMenubarSetInvokingWindow( menu, frame );
+        node = node->GetNext();
     }
-    return -1;
 }
 
-wxMenuItem *wxMenuBar::FindItemForId (int Id, wxMenu ** itemMenu) const
+void wxMenuBar::Detach()
 {
-    if (itemMenu)
-        *itemMenu = NULL;
+    wxMenuBarBase::Detach() ;
+}
 
-    wxMenuItem *item = NULL;
-    int i;
-    for (i = 0; i < m_menuCount; i++)
-        if ((item = m_menus[i]->FindItemForId (Id, itemMenu)))
-            return item;
-    return NULL;
+void wxMenuBar::Attach(wxFrame *frame)
+{
+    wxMenuBarBase::Attach( frame ) ;
 }
+// ---------------------------------------------------------------------------
+// wxMenuBar searching for menu items
+// ---------------------------------------------------------------------------
 
-void wxMenuBar::SetHelpString (int Id, const wxString& helpString)
+// Find the itemString in menuString, and return the item id or wxNOT_FOUND
+int wxMenuBar::FindMenuItem(const wxString& menuString,
+                            const wxString& itemString) const
 {
-    int i;
-    for (i = 0; i < m_menuCount; i++)
+    wxString menuLabel = wxStripMenuCodes(menuString);
+    size_t count = GetMenuCount();
+    for ( size_t i = 0; i < count; i++ )
     {
-        if (m_menus[i]->FindItemForId (Id))
-        {
-            m_menus[i]->SetHelpString (Id, helpString);
-            return;
-        }
+        wxString title = wxStripMenuCodes(m_titles[i]);
+        if ( menuLabel == title )
+            return m_menus[i]->FindItem(itemString);
     }
+
+    return wxNOT_FOUND;
 }
 
-wxString wxMenuBar::GetHelpString (int Id) const
+wxMenuItem *wxMenuBar::FindItem(int id, wxMenu **itemMenu) const
 {
-    int i;
-    for (i = 0; i < m_menuCount; i++)
+    if ( itemMenu )
+        *itemMenu = NULL;
+
+    wxMenuItem *item = NULL;
+    size_t count = GetMenuCount();
+    for ( size_t i = 0; !item && (i < count); i++ )
     {
-        if (m_menus[i]->FindItemForId (Id))
-            return wxString(m_menus[i]->GetHelpString (Id));
+        item = m_menus[i]->FindItem(id, itemMenu);
     }
-    return wxString("");
+
+    return item;
 }