compilation fix

[wxWidgets.git] / src / mac / carbon / uma.cpp

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index c899f874719298e51958dc968ff0a9a763507f42..dbdb59341f67579a89479f8499342cb48602a16e 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -10,6 +10,8 @@
 #      include <PMCore.h>
 #    endif
 #    include <PMApplication.h>
+#  else
+#    include <Printing.h>
 #  endif
 #endif
 
@@ -121,8 +123,17 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
   if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )
     sUMAHasAquaLayout = true ;
   sUMASystemInitialized = true ;
+
 }
 
+/*
+Boolean CanUseATSUI()
+       {
+       long result;
+       OSErr err = Gestalt(gestaltATSUVersion, &result);
+       return (err == noErr);
+       }
+*/
 // process manager
 long UMAGetProcessMode() 
 {
@@ -368,7 +379,7 @@ GrafPtr             UMAGetWindowPort( WindowRef inWindowRef )
 {
        wxASSERT( inWindowRef != NULL ) ;
 #if TARGET_CARBON 
-       return GetWindowPort( inWindowRef ) ; 
+       return (GrafPtr) GetWindowPort( inWindowRef ) ; 
 #else
        return (GrafPtr) inWindowRef ;
 #endif
@@ -578,7 +589,6 @@ OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState )
 }
 
 static OSStatus helpMenuStatus = noErr ;
-static MenuRef helpMenuHandle = NULL ;
 static MenuItemIndex firstCustomItemIndex = 0 ;
 
 OSStatus UMAGetHelpMenu(
@@ -588,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 )
   {