since DoScreenToClient and ClientToScreen in toplvlcmn are implemented by calling...

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

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index c899f874719298e51958dc968ff0a9a763507f42..4fe99c0e6a8d7ce5eac08d6cc0df0177b2f3aad1 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>
 #      include <PMCore.h>
 #    endif
 #    include <PMApplication.h>

+#  else
+#    include <Printing.h>

 #  endif
 #endif
 
 #  endif
 #endif
 


@@ -121,8 +123,17 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
   if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )
     sUMAHasAquaLayout = true ;
   sUMASystemInitialized = true ;
   if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )
     sUMAHasAquaLayout = true ;
   sUMASystemInitialized = true ;

+

 }
 
 }
 

+/*
+Boolean CanUseATSUI()
+       {
+       long result;
+       OSErr err = Gestalt(gestaltATSUVersion, &result);
+       return (err == noErr);
+       }
+*/

 // process manager
 long UMAGetProcessMode() 
 {
 // process manager
 long UMAGetProcessMode() 
 {


@@ -368,7 +379,7 @@ GrafPtr             UMAGetWindowPort( WindowRef inWindowRef )
 {
        wxASSERT( inWindowRef != NULL ) ;
 #if TARGET_CARBON 
 {
        wxASSERT( inWindowRef != NULL ) ;
 #if TARGET_CARBON 

-       return GetWindowPort( inWindowRef ) ; 
+       return (GrafPtr) GetWindowPort( inWindowRef ) ; 

 #else
        return (GrafPtr) inWindowRef ;
 #endif
 #else
        return (GrafPtr) inWindowRef ;
 #endif