X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e75491071dbefcada61175e3eb89ce4edf335983..dbcbe229628c7667da2b6257198467d4f09ab28d:/src/mac/menu.cpp?ds=sidebyside

diff --git a/src/mac/menu.cpp b/src/mac/menu.cpp
index 35589ca6e1..6956a0987a 100644
--- 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"
 
@@ -49,134 +51,16 @@ const short kwxMacAppleMenuId = 1 ;
 // implementation
 // ============================================================================
 
-//
-// Helper Functions to get Mac Menus the way they should be ;-)
-//
-
-void wxMacCtoPString(const char* theCString, Str255 thePString);
-
-// remove inappropriate characters, if useShortcuts is false, the ampersand will not auto-generate a mac menu-shortcut
-
-static void wxMacBuildMenuString(StringPtr outMacItemText, char *outMacShortcutChar , short *outMacModifiers , const char *inItemName , bool useShortcuts )
-{
-	char *p = (char *) &outMacItemText[1] ;
-	short macModifiers = 0 ;
-	char macShortCut = 0 ;
-	
-	if ( useShortcuts && !wxApp::s_macSupportPCMenuShortcuts )
-		useShortcuts = false ;
-	
-	// we have problems with a leading hypen - it will be taken as a separator
-	
-	while ( *inItemName == '-' )
-		inItemName++ ;
-		
-	while( *inItemName )
-	{
-		switch ( *inItemName )
-		{
-			// special characters for macintosh menus -> use some replacement
-			case ';' :
-				*p++ = ',' ;
-				break ;
-			case '^' :
-				*p++ = ' ' ;
-				break ;
-			case '!' :
-				*p++ = ' ' ;
-				break ;
-			case '<' :
-				*p++ = ' ' ;
-				break ;
-			case '/' :
-				*p++ = '|' ;
-				break ;
-			case '(' :
-				*p++ = '[' ;
-				break ;
-			case ')' :	
-				*p++ = ']' ;
-				break ;
-			// shortcuts
-			case '&' :
-				{
-					++inItemName ;
-					if ( *inItemName )
-					{
-						*p++ = *inItemName ;
-						if ( useShortcuts )
-							macShortCut = *inItemName ;
-					}
-					else
-						--inItemName ;
-				}
-				break ;
-			// win-like accelerators
-			case '\t' :
-				{
-					++inItemName ;
-					while( *inItemName )
-					{
-						if (strncmp("Ctrl+", inItemName, 5) == 0) 
-						{
-							inItemName = inItemName + 5;
-							macShortCut = *inItemName;
-						}
-						else if (strncmp("Alt+", inItemName, 4) == 0) 
-						{
-							inItemName = inItemName + 4;
-							macModifiers |= kMenuOptionModifier ;
-							macShortCut = *inItemName ;
-						}
-						else if (strncmp("Shift+", inItemName, 6) == 0) 
-						{
-							inItemName = inItemName + 6;
-							macModifiers |= kMenuShiftModifier ;
-							macShortCut = *inItemName ;
-						}
-						else if (strncmp("F", inItemName, 1) == 0) 
-						{
-							inItemName += strlen( inItemName ) ;
-							// no function keys at the moment
-							// macModifiers |= kMenuShiftModifier ;
-							// macShortCut = *inItemName ;
-						}
-						else
-						{
-							break ;
-						}
-					}
-
-					if ( *inItemName == 0 )
-						--inItemName ;
-						
-				}
-				break ;
-			default :
-				*p++ = *inItemName ;
-		}
-		++inItemName ;
-	}
-
-	outMacItemText[0] = (p - (char *)outMacItemText) - 1;
-	if ( outMacShortcutChar )
-		*outMacShortcutChar = macShortCut ;
-	if ( outMacModifiers )
-		*outMacModifiers = macModifiers ;
-	if ( macShortCut )
-	{
-			int pos = outMacItemText[0] ;
-			outMacItemText[++pos] = '/';
-			outMacItemText[++pos] = toupper( macShortCut );
-			outMacItemText[0] = pos ;
-	}
-}
 
 // Menus
 
 // 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()
 {
@@ -184,10 +68,10 @@ void wxMenu::Init()
 
     // create the menu
 	Str255 	label;
-	wxMacBuildMenuString( label, NULL , NULL , m_title , false );
+	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 = ::NewMenu(m_macMenuId, label);
+	m_hMenu = UMANewMenu(m_macMenuId, label);
 
     if ( !m_hMenu )
     {
@@ -205,7 +89,7 @@ void wxMenu::Init()
 wxMenu::~wxMenu()
 {
 	if (m_hMenu)
-		::DisposeMenu(m_hMenu);
+		UMADisposeMenu(m_hMenu);
 
 #if wxUSE_ACCEL
     // delete accels
@@ -256,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() )
@@ -295,38 +179,28 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
  			Str255 label;
    			wxASSERT_MSG( pSubMenu->m_hMenu != NULL , "invalid submenu added");
 		    pSubMenu->m_menuParent = this ;
-			wxMacBuildMenuString( label , NULL , NULL , pItem->GetText() ,false);
-		
-			// hardcoded adding of the submenu combination for mac
+			wxMenuItem::MacBuildMenuString( label , NULL , NULL , pItem->GetText() ,false);
 		
-			int theEnd = label[0] + 1; 
-			if (theEnd > 251) 
-				theEnd = 251; // mac allows only 255 characters
-			label[theEnd++] = '/';
-			label[theEnd++] = hMenuCmd; 
-			label[theEnd++] = '!';
-			label[theEnd++] = pSubMenu->m_macMenuId; 
-			label[theEnd] = 0x00;
-			label[0] = theEnd;
-
 			if (wxMenuBar::MacGetInstalledMenuBar() == m_menuBar) 
 			{
-				::InsertMenu( pSubMenu->m_hMenu , -1 ) ;
+				UMAInsertMenu( pSubMenu->m_hMenu , -1 ) ;
 			}
 			
 			if ( pos == (size_t)-1 )
 			{
-				MacAppendMenu(m_hMenu, label);
+				UMAAppendSubMenuItem(m_hMenu, label, pSubMenu->m_macMenuId);
 			}
 			else
 			{
-				MacInsertMenuItem(m_hMenu, label , pos);
+				UMAInsertSubMenuItem(m_hMenu, label , pos, pSubMenu->m_macMenuId);
 			}
 		}
 		else
 		{
 			Str255 label ;
-			wxMacBuildMenuString( label , NULL , NULL , pItem->GetText(), pItem->GetId() == wxApp::s_macAboutMenuItemId);
+			UInt8 modifiers ;
+			SInt16 key ;
+			wxMenuItem::MacBuildMenuString( label, &key  , &modifiers , pItem->GetText(), pItem->GetId() == wxApp::s_macAboutMenuItemId);
 			if ( label[0] == 0 )
 			{
 				// we cannot add empty menus on mac
@@ -335,17 +209,17 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
 			}
 			if ( pos == (size_t)-1 )
 			{
-				MacAppendMenu(m_hMenu, label);
+				UMAAppendMenuItem(m_hMenu, label,key,modifiers);
 			}
 			else
 			{
-				MacInsertMenuItem(m_hMenu, label , pos);
+				UMAInsertMenuItem(m_hMenu, label , pos,key,modifiers);
 			}
   			if ( pItem->GetId() == idMenuTitle ) 
   			{
   				if ( pos == (size_t)-1 )
 				{
-					UMADisableMenuItem( m_hMenu , CountMItems( m_hMenu ) ) ;
+					UMADisableMenuItem( m_hMenu , CountMenuItems( m_hMenu ) ) ;
 				}
 				else
 				{
@@ -395,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
@@ -437,113 +311,9 @@ void wxMenu::SetTitle(const wxString& label)
 {
 	Str255 title ;
     m_title = label ;
-	wxMacBuildMenuString( title, NULL , NULL , label , false );
+	wxMenuItem::MacBuildMenuString( title, NULL , NULL , label , false );
 	UMASetMenuTitle( m_hMenu , title ) ;
 }
-
-/*
-
-void wxMenu::SetLabel(int id, const wxString& label)
-{
-    Str255 maclabel ;
-   int index ;
-    wxMenuItem *item = FindItemForId(id) ;
-    if (item==NULL)
-        return;
-
-    index = MacGetIndexFromItem( item ) ;
-    if (index < 1)
-		return;
-
-    if (item->GetSubMenu()==NULL)
-    {
-		wxMacBuildMenuString( maclabel , NULL , NULL , label , false );
-		::SetMenuItemText( m_hMenu , index , maclabel ) ;
-    }
-    else
-    {
-		wxMacBuildMenuString( maclabel , NULL , NULL , label , false );
-		::SetMenuItemText( m_hMenu , index , maclabel ) ;
-    }
-    item->SetName(label);
-}
-
-wxString wxMenu::GetLabel(int Id) const
-{
-    wxMenuItem *pItem = FindItemForId(Id) ;
-    return pItem->GetName() ;
-}
-
-// Finds the item id matching the given string, -1 if not found.
-int wxMenu::FindItem (const wxString& itemString) const
-{
-    char buf1[200];
-    char buf2[200];
-    wxStripMenuCodes ((char *)(const char *)itemString, buf1);
-
-    for (wxNode * node = m_menuItems.First (); node; node = node->Next ())
-    {
-      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();
-      }
-    }
-
-    return -1;
-}
-
-wxMenuItem *wxMenu::FindItemForId(int itemId, wxMenu ** itemMenu) const
-{
-    if (itemMenu)
-        *itemMenu = NULL;
-    for (wxNode * node = m_menuItems.First (); node; node = node->Next ())
-    {
-        wxMenuItem *item = (wxMenuItem *) node->Data ();
-
-        if (item->GetId() == itemId)
-        {
-            if (itemMenu)
-                *itemMenu = (wxMenu *) this;
-            return item;
-        }
-
-        if (item->GetSubMenu())
-        {
-            wxMenuItem *ans = item->GetSubMenu()->FindItemForId (itemId, itemMenu);
-            if (ans)
-                return ans;
-        }
-    }
-
-    if (itemMenu)
-        *itemMenu = NULL;
-    return NULL;
-}
-
-void wxMenu::SetHelpString(int itemId, const wxString& helpString)
-{
-    wxMenuItem *item = FindItemForId (itemId);
-    if (item)
-        item->SetHelp(helpString);
-}
-
-wxString wxMenu::GetHelpString (int itemId) const
-{
-    wxMenuItem *item = FindItemForId (itemId);
-    wxString str("");
-    return (item == NULL) ? str : item->GetHelp();
-}
-*/
-
 bool wxMenu::ProcessCommand(wxCommandEvent & event)
 {
     bool processed = FALSE;
@@ -577,46 +347,16 @@ 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;
 }
-/*
-bool wxWindow::PopupMenu(wxMenu *menu, int x, int y)
-{
-	menu->SetInvokingWindow(this);
-	ClientToScreen( &x , &y ) ;
-
-	::InsertMenu( menu->m_hMenu , -1 ) ;
-  long menuResult = ::PopUpMenuSelect(menu->m_hMenu ,y,x, 0) ;
-  menu->MacMenuSelect( this , TickCount() , HiWord(menuResult) , LoWord(menuResult) ) ;
-	::DeleteMenu( menu->m_macMenuId ) ;
-  menu->SetInvokingWindow(NULL);
 
-  return TRUE;
-}
-*/
 // 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
 
@@ -677,15 +417,40 @@ bool wxMenu::MacMenuSelect( wxEvtHandler* handler, long when , int macMenuId, in
 		if (node) 
 		{
 			wxMenuItem *pItem = (wxMenuItem*)node->Data();
-	
+
+			if (pItem->IsCheckable())
+				pItem->Check(! pItem->IsChecked());
+
 			wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED, pItem->GetId());
 			event.m_timeStamp = when;
 			event.SetEventObject(handler);
      		event.SetInt( pItem->GetId() );
-     		ProcessCommand( event ) ;
+			{
+				bool processed = false ;
+
+#if WXWIN_COMPATIBILITY
+			    // Try a callback
+			    if (m_callback)
+			    {
+			            (void) (*(m_callback)) (*this, event);
+			            processed = TRUE;
+			    }
+#endif			
+			    // Try the menu's event handler
+			    if ( !processed && handler)
+			    {
+			            processed = handler->ProcessEvent(event);
+			    }
+			
+			  	// Try the window the menu was popped up from (and up
+			  	// through the hierarchy)
+			  	if ( !processed && GetInvokingWindow())
+			    	processed = GetInvokingWindow()->GetEventHandler()->ProcessEvent(event);
+		  	}
 			return true ;
 		}
 	}
+#ifndef __DARWIN__
 	else if ( macMenuId == kHMHelpMenuID )
 	{
 		int menuItem = formerHelpMenuItems ;
@@ -708,12 +473,33 @@ bool wxMenu::MacMenuSelect( wxEvtHandler* handler, long when , int macMenuId, in
 					event.m_timeStamp = when;
 					event.SetEventObject(handler);
        				event.SetInt( pItem->GetId() );
-    				ProcessCommand( event ) ;
+					{
+						bool processed = false ;
+#if WXWIN_COMPATIBILITY
+					    // Try a callback
+					    if (m_callback)
+					    {
+					            (void) (*(m_callback)) (*this, event);
+					            processed = TRUE;
+					    }
+#endif					
+					    // Try the menu's event handler
+					    if ( !processed && handler)
+					    {
+					            processed = handler->ProcessEvent(event);
+					    }
+					
+					  	// Try the window the menu was popped up from (and up
+					  	// through the hierarchy)
+					  	if ( !processed && GetInvokingWindow())
+					    	processed = GetInvokingWindow()->GetEventHandler()->ProcessEvent(event);
+				  	}
 					return true ;
 				}
 			}
 	  }
 	}
+#endif // __DARWIN__
 
   for (pos = 0, node = GetMenuItems().First(); node; node = node->Next(), pos++) 
   {	
@@ -757,6 +543,16 @@ void wxMenuBar::Init()
     m_menuBarFrame = NULL;
 }
 
+wxMenuBar::wxMenuBar()
+{
+    Init();
+}
+
+wxMenuBar::wxMenuBar( long WXUNUSED(style) )
+{
+    Init();
+}
+
 
 wxMenuBar::wxMenuBar(int count, wxMenu *menus[], const wxString titles[])
 {
@@ -790,8 +586,42 @@ void wxMenuBar::Refresh()
     DrawMenuBar();
 }
 
+#if wxUSE_ACCEL
+
+void wxMenuBar::RebuildAccelTable()
+{
+    // merge the accelerators of all menus into one accel table
+    size_t nAccelCount = 0;
+    size_t i, count = GetMenuCount();
+    for ( i = 0; i < count; i++ )
+    {
+        nAccelCount += m_menus[i]->GetAccelCount();
+    }
+
+    if ( nAccelCount )
+    {
+        wxAcceleratorEntry *accelEntries = new wxAcceleratorEntry[nAccelCount];
+
+        nAccelCount = 0;
+        for ( i = 0; i < count; i++ )
+        {
+            nAccelCount += m_menus[i]->CopyAccels(&accelEntries[nAccelCount]);
+        }
+
+        m_accelTable = wxAcceleratorTable(nAccelCount, accelEntries);
+
+        delete [] accelEntries;
+    }
+}
+
+#endif // wxUSE_ACCEL
+
+
 void wxMenuBar::MacInstallMenuBar() 
 {
+	if ( s_macInstalledMenuBar == this )
+		return ;
+		
   	Handle menubar = ::GetNewMBar( kwxMacMenuBarResource ) ;
   	wxString message ;
   	wxCHECK_RET( menubar != NULL, "can't read MBAR resource" );
@@ -809,8 +639,9 @@ void wxMenuBar::MacInstallMenuBar()
     	int pos ;
 			wxMenu* menu = m_menus[i] , *subMenu = NULL ;
 		
-			
-			if( m_titles[i] == "?" || m_titles[i] == wxApp::s_macHelpMenuTitleName )
+#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 )
@@ -823,8 +654,8 @@ void wxMenuBar::MacInstallMenuBar()
 						formerHelpMenuItems = CountMenuItems( mh ) ;
 				}
 					
-		  	for (pos = 0 , node = menu->GetMenuItems().First(); node; node = node->Next(), pos++) 
-	  		{
+			  	for (pos = 0 , node = menu->GetMenuItems().First(); node; node = node->Next(), pos++) 
+		  		{
 		 			item = (wxMenuItem *)node->Data();
 		 			subMenu = item->GetSubMenu() ;
 					if (subMenu)	 		
@@ -833,45 +664,84 @@ void wxMenuBar::MacInstallMenuBar()
 					}
 					else		
 					{
-						Str255 label ;
-						wxMacBuildMenuString( label , NULL , NULL , item->GetText(), item->GetId() != wxApp::s_macAboutMenuItemId); // no shortcut in about menu
-						if ( label[0] == 0 )
+						if ( item->IsSeparator() )
 						{
-							// we cannot add empty menus on mac
-							label[0] = 1 ;
-							label[1] = ' ' ;
+							if ( mh )
+								UMAAppendMenuItem(mh, "\p-" );
 						}
-						if ( item->GetId() == wxApp::s_macAboutMenuItemId )
-						{ 
-								::SetMenuItemText( GetMenuHandle( kwxMacAppleMenuId ) , 1 , label );
-		//					::EnableMenuItem( GetMenuHandle( kwxMacAppleMenuId ) , 1 );
-								::EnableItem( GetMenuHandle( kwxMacAppleMenuId ) , 1 );
- 						}
 						else
 						{
-							if ( mh )
-								::AppendMenu(mh, label );
+							Str255 label ;
+							UInt8 modifiers ;
+							SInt16 key ;
+							wxMenuItem::MacBuildMenuString( label, &key , &modifiers  , item->GetText(), item->GetId() != wxApp::s_macAboutMenuItemId); // no shortcut in about menu
+							if ( label[0] == 0 )
+							{
+								// we cannot add empty menus on mac
+								label[0] = 1 ;
+								label[1] = ' ' ;
+							}
+							if ( item->GetId() == wxApp::s_macAboutMenuItemId )
+							{ 
+									UMASetMenuItemText( GetMenuHandle( kwxMacAppleMenuId ) , 1 , label );
+									UMAEnableMenuItem( GetMenuHandle( kwxMacAppleMenuId ) , 1 );
+	 						}
+							else
+							{
+								if ( mh )
+									UMAAppendMenuItem(mh, label , key , modifiers );
+							}
 						}
 					}
 				}
 			}
+#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
 			{
-				wxMacBuildMenuString( label, NULL , NULL , m_titles[i] , false );
+				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++) 
-	  		{
+		  		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 ) ;
+						UMAInsertMenu( subMenu->GetHMenu() , -1 ) ;
 					}
 				}
-				::InsertMenu(m_menus[i]->GetHMenu(), 0);
+				UMAInsertMenu(m_menus[i]->GetHMenu(), 0);
 			}
 		}
-		::DrawMenuBar() ;
+		UMADrawMenuBar() ;
 
 	s_macInstalledMenuBar = this;
 }
@@ -946,18 +816,18 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
     {
 		if (s_macInstalledMenuBar == this)
 		{
-			::DeleteMenu( menuOld->MacGetMenuId() /* m_menus[pos]->MacGetMenuId() */ ) ;
+			UMADeleteMenu( menuOld->MacGetMenuId() /* m_menus[pos]->MacGetMenuId() */ ) ;
 			{
 				Str255 	label;
-				wxMacBuildMenuString( label, NULL , NULL , title , false );
+				wxMenuItem::MacBuildMenuString( label, NULL , NULL , title , false );
 				UMASetMenuTitle( menu->GetHMenu() , label ) ;
 				if ( pos == m_menus.GetCount() - 1)
 				{
-					::InsertMenu( menu->GetHMenu() , 0 ) ;
+					UMAInsertMenu( menu->GetHMenu() , 0 ) ;
 				}
 				else
 				{
-					::InsertMenu( menu->GetHMenu() , m_menus[pos+1]->MacGetMenuId() ) ;
+					UMAInsertMenu( menu->GetHMenu() , m_menus[pos+1]->MacGetMenuId() ) ;
 				}
 			}
 		}
@@ -1027,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 || 
-	  		( macMenuId == kHMHelpMenuID && ( m_titles[i] == "?" || m_titles[i] == wxApp::s_macHelpMenuTitleName ) )
+	  	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 ) )
@@ -1047,7 +920,118 @@ void wxMenuBar::MacMenuSelect(wxEvtHandler* handler, long when , int macMenuId,
 	  	{
 	  		break ;
 	  	}
-		}
+	  }
 	}
 }
 
+wxMenu *wxMenuBar::Remove(size_t pos)
+{
+    wxMenu *menu = wxMenuBarBase::Remove(pos);
+    if ( !menu )
+        return NULL;
+
+    if ( IsAttached() )
+    {
+		if (s_macInstalledMenuBar == this)
+		{
+			::DeleteMenu( menu->MacGetMenuId() /* m_menus[pos]->MacGetMenuId() */ ) ;
+		}
+
+        menu->Detach();
+
+#if wxUSE_ACCEL
+        if ( menu->HasAccels() )
+        {
+            // need to rebuild accell table
+            RebuildAccelTable();
+        }
+#endif // wxUSE_ACCEL
+
+        Refresh();
+    }
+
+    m_titles.Remove(pos);
+
+    return menu;
+}
+
+bool wxMenuBar::Append(wxMenu *menu, const wxString& title)
+{
+    WXHMENU submenu = menu ? menu->GetHMenu() : 0;
+    wxCHECK_MSG( submenu, FALSE, wxT("can't append invalid menu to menubar") );
+
+    if ( !wxMenuBarBase::Append(menu, title) )
+        return FALSE;
+
+    m_titles.Add(title);
+
+    if ( IsAttached() )
+    {
+		if (s_macInstalledMenuBar == this)
+		{
+			::InsertMenu( menu->GetHMenu() , 0 ) ;
+		}
+
+#if wxUSE_ACCEL
+        if ( menu->HasAccels() )
+        {
+            // need to rebuild accell table
+            RebuildAccelTable();
+        }
+#endif // wxUSE_ACCEL
+
+        Refresh();
+    }
+
+    return TRUE;
+}
+
+void wxMenuBar::Detach()
+{
+    wxMenuBarBase::Detach() ;
+}
+
+void wxMenuBar::Attach(wxFrame *frame)
+{
+    wxMenuBarBase::Attach( frame ) ;
+
+#if wxUSE_ACCEL
+    RebuildAccelTable();
+#endif // wxUSE_ACCEL
+}
+// ---------------------------------------------------------------------------
+// wxMenuBar searching for menu items
+// ---------------------------------------------------------------------------
+
+// Find the itemString in menuString, and return the item id or wxNOT_FOUND
+int wxMenuBar::FindMenuItem(const wxString& menuString,
+                            const wxString& itemString) const
+{
+    wxString menuLabel = wxStripMenuCodes(menuString);
+    size_t count = GetMenuCount();
+    for ( size_t i = 0; i < count; i++ )
+    {
+        wxString title = wxStripMenuCodes(m_titles[i]);
+        if ( menuString == title )
+            return m_menus[i]->FindItem(itemString);
+    }
+
+    return wxNOT_FOUND;
+}
+
+wxMenuItem *wxMenuBar::FindItem(int id, wxMenu **itemMenu) const
+{
+    if ( itemMenu )
+        *itemMenu = NULL;
+
+    wxMenuItem *item = NULL;
+    size_t count = GetMenuCount();
+    for ( size_t i = 0; !item && (i < count); i++ )
+    {
+        item = m_menus[i]->FindItem(id, itemMenu);
+    }
+
+    return item;
+}
+
+