X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f1ae4143271ae63a17e052a1a471d16e9cd8c44..ccb220600d4a0cda7ecfc89269532476fe570c3c:/src/mac/carbon/menu.cpp?ds=sidebyside

diff --git a/src/mac/carbon/menu.cpp b/src/mac/carbon/menu.cpp
index 9a66f806d2..621494b83d 100644
--- a/src/mac/carbon/menu.cpp
+++ b/src/mac/carbon/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"
 
@@ -362,7 +364,7 @@ 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 +462,7 @@ bool wxMenu::MacMenuSelect( wxEvtHandler* handler, long when , int macMenuId, in
 			return true ;
 		}
 	}
+#ifndef __WXMAC_X__
 	else if ( macMenuId == kHMHelpMenuID )
 	{
 		int menuItem = formerHelpMenuItems ;
@@ -508,6 +511,7 @@ bool wxMenu::MacMenuSelect( wxEvtHandler* handler, long when , int macMenuId, in
 			}
 	  }
 	}
+#endif // __WXMAC_X__
 
   for (pos = 0, node = GetMenuItems().First(); node; node = node->Next(), pos++) 
   {	
@@ -627,6 +631,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" );
@@ -700,8 +707,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)	 		
+					{
+						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
 			{
 				wxMenuItem::MacBuildMenuString( label, NULL , NULL , m_titles[i] , false );
 				UMASetMenuTitle( menu->GetHMenu() , label ) ;
@@ -873,8 +909,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 __WXMAC_X__
+		     || 
 	  		( macMenuId == kHMHelpMenuID && ( m_titles[i] == "?" || m_titles[i] == "&?"  || m_titles[i] == wxApp::s_macHelpMenuTitleName ) )
+#endif
 	  		)
 	  	{
 	  		if ( m_menus[i]->MacMenuSelect( handler , when , macMenuId , macMenuItemNum ) )