X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/66a09d4776b8ae390d5aa51dbd678b694f2c81d6..ef7f21894c8542838e17c8b441ff8d748fd675cd:/src/mac/carbon/uma.cpp

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index 2ca3e8cc2b..c9342a3947 100644
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -94,7 +94,6 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
 		sUMAHasWindowManager = sUMAWindowManagerAttr & gestaltWindowMgrPresent ;
 	}
 		
-#ifndef __DARWIN__
 #if TARGET_CARBON
 // Call currently implicitely done :		InitFloatingWindows() ;
 #else
@@ -102,7 +101,6 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
 		InitFloatingWindows() ;
 	else
 		InitWindows();
-#endif
 #endif
 
 	if ( NavServicesAvailable() )
@@ -379,7 +377,7 @@ GrafPtr		UMAGetWindowPort( WindowRef inWindowRef )
 {
 	wxASSERT( inWindowRef != NULL ) ;
 #if TARGET_CARBON 
-	return GetWindowPort( inWindowRef ) ; 
+	return (GrafPtr) GetWindowPort( inWindowRef ) ; 
 #else
 	return (GrafPtr) inWindowRef ;
 #endif
@@ -588,9 +586,10 @@ OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState )
   return ::DrawThemePlacard( inRect , inState ) ;
 }
 
+#if !TARGET_CARBON
 static OSStatus helpMenuStatus = noErr ;
-static MenuRef helpMenuHandle = NULL ;
 static MenuItemIndex firstCustomItemIndex = 0 ;
+#endif
 
 OSStatus UMAGetHelpMenu(
   MenuRef *        outHelpMenu,
@@ -599,13 +598,11 @@ OSStatus UMAGetHelpMenu(
 #if TARGET_CARBON
   return HMGetHelpMenu( outHelpMenu , outFirstCustomItemIndex ) ;
 #else
-  if ( helpMenuHandle == NULL )
+  MenuRef helpMenuHandle ;
+  helpMenuStatus = HMGetHelpMenuHandle( &helpMenuHandle ) ;
+  if ( firstCustomItemIndex == 0 && helpMenuStatus == noErr )
   {
-    helpMenuStatus = HMGetHelpMenuHandle( &helpMenuHandle ) ;
-    if ( helpMenuStatus == noErr )
-    {
-      firstCustomItemIndex = CountMenuItems( helpMenuHandle ) + 1 ;
-    }
+    firstCustomItemIndex = CountMenuItems( helpMenuHandle ) + 1 ;
   }
   if ( outFirstCustomItemIndex )
   {