X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e75491071dbefcada61175e3eb89ce4edf335983..7379599933e8db2dc319bd5240b4992687db4e46:/src/mac/carbon/menu.cpp?ds=inline

diff --git a/src/mac/carbon/menu.cpp b/src/mac/carbon/menu.cpp
index 35589ca6e1..e81e6de61a 100644
--- a/src/mac/carbon/menu.cpp
+++ b/src/mac/carbon/menu.cpp
@@ -22,10 +22,13 @@
 #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"
 
@@ -40,7 +43,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 ;
@@ -49,134 +52,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,9 +69,8 @@ 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);
 
     if ( !m_hMenu )
@@ -204,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
@@ -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() )
@@ -280,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 
@@ -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);
+			wxMenuItem::MacBuildMenuString( label , NULL , NULL , pItem->GetText() ,false);
 		
-			// hardcoded adding of the submenu combination for mac
-		
-			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 ) ;
+				::InsertMenu( MAC_WXHMENU( pSubMenu->m_hMenu ) , -1 ) ;
 			}
 			
 			if ( pos == (size_t)-1 )
 			{
-				MacAppendMenu(m_hMenu, label);
+				UMAAppendSubMenuItem(MAC_WXHMENU(m_hMenu), label, pSubMenu->m_macMenuId);
 			}
 			else
 			{
-				MacInsertMenuItem(m_hMenu, label , pos);
+				UMAInsertSubMenuItem(MAC_WXHMENU(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,21 +209,47 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
 			}
 			if ( pos == (size_t)-1 )
 			{
-				MacAppendMenu(m_hMenu, label);
+				UMAAppendMenuItem(MAC_WXHMENU(m_hMenu), label,key,modifiers);
+				SetMenuItemCommandID( MAC_WXHMENU(m_hMenu) , CountMenuItems(MAC_WXHMENU(m_hMenu))  , pItem->GetId() ) ;
+				if ( pItem->GetBitmap().Ok() )
+				{
+					ControlButtonContentInfo info ;
+					wxMacCreateBitmapButton( &info , pItem->GetBitmap() , kControlContentCIconHandle ) ;
+					if ( info.contentType != kControlNoContent )
+					{
+						if ( info.contentType == kControlContentCIconHandle )
+							SetMenuItemIconHandle( MAC_WXHMENU(m_hMenu) , CountMenuItems(MAC_WXHMENU(m_hMenu) ) ,
+								kMenuColorIconType , (Handle) info.u.cIconHandle ) ;
+				    }
+						
+				}
 			}
 			else
 			{
-				MacInsertMenuItem(m_hMenu, label , pos);
+				UMAInsertMenuItem(MAC_WXHMENU(m_hMenu), label , pos,key,modifiers);
+				SetMenuItemCommandID( MAC_WXHMENU(m_hMenu) , pos , pItem->GetId() ) ;
+				if ( pItem->GetBitmap().Ok() )
+				{
+					ControlButtonContentInfo info ;
+					wxMacCreateBitmapButton( &info , pItem->GetBitmap() , kControlContentCIconHandle ) ;
+					if ( info.contentType != kControlNoContent )
+					{
+						if ( info.contentType == kControlContentCIconHandle )
+							SetMenuItemIconHandle( MAC_WXHMENU(m_hMenu) , pos ,
+								kMenuColorIconType , (Handle) info.u.cIconHandle ) ;
+				    }
+						
+				}
 			}
   			if ( pItem->GetId() == idMenuTitle ) 
   			{
   				if ( pos == (size_t)-1 )
 				{
-					UMADisableMenuItem( m_hMenu , CountMItems( 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 ) ;
 				}
   			}
 		}
@@ -395,12 +295,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() )
     {
@@ -437,113 +337,9 @@ void wxMenu::SetTitle(const wxString& label)
 {
 	Str255 title ;
     m_title = label ;
-	wxMacBuildMenuString( 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();
+	wxMenuItem::MacBuildMenuString( title, NULL , NULL , label , false );
+	UMASetMenuTitle(MAC_WXHMENU(m_hMenu) , title ) ;
 }
-*/
-
 bool wxMenu::ProcessCommand(wxCommandEvent & event)
 {
     bool processed = FALSE;
@@ -577,46 +373,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
 
@@ -659,77 +425,13 @@ 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() ;
 }
 
-bool wxMenu::MacMenuSelect( wxEvtHandler* handler, long when , int macMenuId, int macMenuItemNum )
-{
-  int pos;
-  wxNode *node;
-
-	if ( m_macMenuId == macMenuId )
-	{
-		node = GetMenuItems().Nth(macMenuItemNum-1);
-		if (node) 
-		{
-			wxMenuItem *pItem = (wxMenuItem*)node->Data();
-	
-			wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED, pItem->GetId());
-			event.m_timeStamp = when;
-			event.SetEventObject(handler);
-     		event.SetInt( pItem->GetId() );
-     		ProcessCommand( event ) ;
-			return true ;
-		}
-	}
-	else if ( macMenuId == kHMHelpMenuID )
-	{
-		int menuItem = formerHelpMenuItems ;
-	  for (pos = 0, node = GetMenuItems().First(); node; node = node->Next(), pos++) 
-	  {	
-	  	wxMenuItem * pItem = (wxMenuItem *)  node->Data() ;
-	  	
-	  	wxMenu *pSubMenu = pItem->GetSubMenu() ;
-			if ( pSubMenu != NULL )
-			{
-			}
-			else
-			{
-				if ( pItem->GetId() != wxApp::s_macAboutMenuItemId )
-					++menuItem ;
-					
-				if ( menuItem == macMenuItemNum )
-				{
-					wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED, pItem->GetId());
-					event.m_timeStamp = when;
-					event.SetEventObject(handler);
-       				event.SetInt( pItem->GetId() );
-    				ProcessCommand( event ) ;
-					return true ;
-				}
-			}
-	  }
-	}
-
-  for (pos = 0, node = GetMenuItems().First(); node; node = node->Next(), pos++) 
-  {	
-  		wxMenuItem * pItem = (wxMenuItem *)  node->Data() ;
-  	
-  		wxMenu *pSubMenu = pItem->GetSubMenu() ;
-		if ( pSubMenu != NULL )
-		{
-			if ( pSubMenu->MacMenuSelect( handler , when , macMenuId , macMenuItemNum ) )
-				return true ;
-		}
-  }
-
-	return false ;
-}
-
 // Menu Bar
 
 /* 
@@ -757,6 +459,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[])
 {
@@ -783,58 +495,110 @@ wxMenuBar::~wxMenuBar()
 
 }
 
-void wxMenuBar::Refresh()
+void wxMenuBar::Refresh(bool WXUNUSED(eraseBackground), const wxRect *WXUNUSED(rect))
 {
     wxCHECK_RET( IsAttached(), wxT("can't refresh unatteched menubar") );
 
     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() 
 {
-  	Handle menubar = ::GetNewMBar( kwxMacMenuBarResource ) ;
-  	wxString message ;
-  	wxCHECK_RET( menubar != NULL, "can't read MBAR resource" );
-  	::SetMenuBar( menubar ) ;
-  	::DisposeHandle( menubar ) ;
-
-		MenuHandle menu = ::GetMenuHandle( kwxMacAppleMenuId ) ;
-		::AppendResMenu(menu, 'DRVR');
+    if ( s_macInstalledMenuBar == this )
+        return ;
+		
+    wxStAppResource resload ;
+		
+    Handle menubar = ::GetNewMBar( kwxMacMenuBarResource ) ;
+    wxString message ;
+    wxCHECK_RET( menubar != NULL, "can't read MBAR resource" );
+    ::SetMenuBar( menubar ) ;
+#if TARGET_API_MAC_CARBON
+    ::DisposeMenuBar( menubar ) ;
+#else
+    ::DisposeHandle( menubar ) ;
+#endif
+
+#if TARGET_API_MAC_OS8
+    MenuHandle menu = ::GetMenuHandle( kwxMacAppleMenuId ) ;
+    if ( CountMenuItems( menu ) == 2 )
+    {
+        ::AppendResMenu(menu, 'DRVR');
+    }
+#endif
  
-   	for (int i = 0; i < m_menus.GetCount(); i++)
+   	for (size_t i = 0; i < m_menus.GetCount(); i++)
   	{
-			Str255 	label;
-    	wxNode *node;
-    	wxMenuItem *item;
-    	int pos ;
-			wxMenu* menu = m_menus[i] , *subMenu = NULL ;
-		
-			
-			if( m_titles[i] == "?" || m_titles[i] == wxApp::s_macHelpMenuTitleName )
+        Str255 	label;
+        wxNode *node;
+        wxMenuItem *item;
+        int pos ;
+    	wxMenu* menu = m_menus[i] , *subMenu = NULL ;
+
+    	if( m_titles[i] == "?" || m_titles[i] == "&?"  || m_titles[i] == wxApp::s_macHelpMenuTitleName )
+    	{
+			MenuHandle mh = NULL ;
+			if ( UMAGetHelpMenu( &mh , &firstUserHelpMenuItem) != noErr )
 			{
-				MenuHandle mh = NULL ;
-				if ( HMGetHelpMenuHandle( &mh ) != noErr )
+			    continue ;
+			}
+
+		    for ( int i = CountMenuItems( mh ) ; i >= firstUserHelpMenuItem ; --i )
+		    {
+		        DeleteMenuItem( mh , i ) ;
+		    }
+				
+		  	for (pos = 0 , node = menu->GetMenuItems().First(); node; node = node->Next(), pos++) 
+	  		{
+	 			item = (wxMenuItem *)node->Data();
+	 			subMenu = item->GetSubMenu() ;
+				if (subMenu)	 		
 				{
-					continue ;
+					// we don't support hierarchical menus in the help menu yet
 				}
-				if ( formerHelpMenuItems == 0 )
+				else		
 				{
-					if( mh )
-						formerHelpMenuItems = CountMenuItems( mh ) ;
-				}
-					
-		  	for (pos = 0 , node = menu->GetMenuItems().First(); node; node = node->Next(), pos++) 
-	  		{
-		 			item = (wxMenuItem *)node->Data();
-		 			subMenu = item->GetSubMenu() ;
-					if (subMenu)	 		
+					if ( item->IsSeparator() )
 					{
-						// we don't support hierarchical menus in the help menu yet
+						if ( mh )
+							MacAppendMenu(mh, "\p-" );
 					}
-					else		
+					else
 					{
 						Str255 label ;
-						wxMacBuildMenuString( label , NULL , NULL , item->GetText(), item->GetId() != wxApp::s_macAboutMenuItemId); // no shortcut in about menu
+						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
@@ -844,35 +608,57 @@ void wxMenuBar::MacInstallMenuBar()
 						if ( item->GetId() == wxApp::s_macAboutMenuItemId )
 						{ 
 								::SetMenuItemText( GetMenuHandle( kwxMacAppleMenuId ) , 1 , label );
-		//					::EnableMenuItem( GetMenuHandle( kwxMacAppleMenuId ) , 1 );
-								::EnableItem( GetMenuHandle( kwxMacAppleMenuId ) , 1 );
+								UMAEnableMenuItem( GetMenuHandle( kwxMacAppleMenuId ) , 1 );
+								SetMenuItemCommandID( GetMenuHandle( kwxMacAppleMenuId ) , 1 , item->GetId() ) ;
  						}
 						else
 						{
 							if ( mh )
-								::AppendMenu(mh, label );
+							{
+								UMAAppendMenuItem(mh, label , key , modifiers );
+								SetMenuItemCommandID( mh , CountMenuItems(mh) , item->GetId() ) ;
+							}
 						}
 					}
 				}
 			}
-			else
-			{
-				wxMacBuildMenuString( 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
+		{
+			wxMenuItem::MacBuildMenuString( label, NULL , NULL , m_titles[i] , false );
+			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)	 		
+				{
+				  submenus.Add(subMenu) ;
 				}
-				::InsertMenu(m_menus[i]->GetHMenu(), 0);
 			}
+			::InsertMenu(MAC_WXHMENU(m_menus[i]->GetHMenu()), 0);
+			for ( size_t 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 ) ;
+		    }
 		}
-		::DrawMenuBar() ;
-
+	}
+	::DrawMenuBar() ;
 	s_macInstalledMenuBar = this;
 }
 
@@ -949,15 +735,15 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
 			::DeleteMenu( menuOld->MacGetMenuId() /* m_menus[pos]->MacGetMenuId() */ ) ;
 			{
 				Str255 	label;
-				wxMacBuildMenuString( label, NULL , NULL , title , false );
-				UMASetMenuTitle( menu->GetHMenu() , label ) ;
+				wxMenuItem::MacBuildMenuString( label, NULL , NULL , title , false );
+				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() ) ;
 				}
 			}
 		}
@@ -984,17 +770,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
@@ -1011,43 +799,167 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
     return TRUE;
 }
 
-void wxMenuBar::MacMenuSelect(wxEvtHandler* handler, long when , int macMenuId, int macMenuItemNum)
+wxMenu *wxMenuBar::Remove(size_t pos)
 {
-	// first scan fast for direct commands, i.e. menus which have these commands directly in their own list
+    wxMenu *menu = wxMenuBarBase::Remove(pos);
+    if ( !menu )
+        return NULL;
 
-	if ( macMenuId == kwxMacAppleMenuId && macMenuItemNum == 1 )
-	{
-			wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED, wxApp::s_macAboutMenuItemId );
-			event.m_timeStamp = when;
-			event.SetEventObject(handler);
-     	event.SetInt( wxApp::s_macAboutMenuItemId );
-			handler->ProcessEvent(event);
-	}
-	else
-	{		
-	  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]->MacMenuSelect( handler , when , macMenuId , macMenuItemNum ) )
-	  			return ;
-	  		else
-	  		{
-	  			//TODO flag this as an error since it must contain the item
-	  			return ;
-	  		}
-	  	}
-		}
-	
-	  for (int i = 0; i < m_menus.GetCount(); i++)
-	  {
-	  	if ( m_menus[i]->MacMenuSelect( handler , when , macMenuId , macMenuItemNum ) )
-	  	{
-	  		break ;
-	  	}
+    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);
+    
+    Str255 label ;
+		wxMenuItem::MacBuildMenuString( label, NULL , NULL , title , false );
+		UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , label ) ;
+
+    if ( IsAttached() )
+    {
+    		if (s_macInstalledMenuBar == this)
+    		{
+    			::InsertMenu( MAC_WXHMENU(menu->GetHMenu()) , 0 ) ;
+    		}
+
+#if wxUSE_ACCEL
+        if ( menu->HasAccels() )
+        {
+            // need to rebuild accell table
+            RebuildAccelTable();
+        }
+#endif // wxUSE_ACCEL
+
+        Refresh();
+    }
+
+    return TRUE;
+}
+
+static void wxMenubarUnsetInvokingWindow( wxMenu *menu )
+{
+    menu->SetInvokingWindow( (wxWindow*) NULL );
+
+    wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();
+    while (node)
+    {
+        wxMenuItem *menuitem = node->GetData();
+        if (menuitem->IsSubMenu())
+            wxMenubarUnsetInvokingWindow( menuitem->GetSubMenu() );
+        node = node->GetNext();
+    }
+}
+
+static void wxMenubarSetInvokingWindow( wxMenu *menu, wxWindow *win )
+{
+    menu->SetInvokingWindow( win );
+
+    wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();
+    while (node)
+    {
+        wxMenuItem *menuitem = node->GetData();
+        if (menuitem->IsSubMenu())
+            wxMenubarSetInvokingWindow( menuitem->GetSubMenu() , win );
+        node = node->GetNext();
+    }
+}
+
+void wxMenuBar::UnsetInvokingWindow()
+{
+    wxMenuList::Node *node = m_menus.GetFirst();
+    while (node)
+    {
+        wxMenu *menu = node->GetData();
+        wxMenubarUnsetInvokingWindow( menu );
+        node = node->GetNext();
+    }
 }
 
+void wxMenuBar::SetInvokingWindow(wxFrame *frame)
+{
+    wxMenuList::Node *node = m_menus.GetFirst();
+    while (node)
+    {
+        wxMenu *menu = node->GetData();
+        wxMenubarSetInvokingWindow( menu, frame );
+        node = node->GetNext();
+    }
+}
+
+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;
+}
+
+