X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03e11df5470fd64d9d9a669d0b50b84c2d714736..0013a77bd1e294fe6d983fc53dac909a07c52b5d:/include/wx/mac/uma.h?ds=sidebyside

diff --git a/include/wx/mac/uma.h b/include/wx/mac/uma.h
index 0898dc057a..ed8cc1997f 100644
--- a/include/wx/mac/uma.h
+++ b/include/wx/mac/uma.h
@@ -21,17 +21,21 @@
 #define UMA_USE_8_6 1 
 #endif
 
-#if defined(__POWERPC__) || defined(__APPLE__)
+#if defined(__POWERPC__)
     #define UMA_USE_APPEARANCE 1
     #define UMA_USE_WINDOWMGR 1
-    #if defined(__APPLE__)
+    #if defined(__DARWIN__)
         #include <Carbon/Carbon.h>
     #endif
 #else
-    #define UMA_USE_APPEARANCE 0
+    #define UMA_USE_APPEARANCE 1
     #define UMA_USE_WINDOWMGR 0
 #endif
 
+#if UMA_USE_APPEARANCE == 0 
+    #pragma error "wxMac needs appearance"
+#endif
+
 #if !UMA_USE_8_6 && UMA_USE_WINDOWMGR
 #undef UMA_USE_WINDOWMGR
 #define UMA_USE_WINDOWMGR 0
@@ -78,8 +82,13 @@ void			UMADrawMenuBar() ;
 void			UMAShowWatchCursor() ;
 void			UMAShowArrowCursor() ;
 
+#if TARGET_CARBON && PM_USE_SESSION_APIS
+OSStatus		UMAPrOpen(PMPrintSession *macPrintSession) ;
+OSStatus		UMAPrClose(PMPrintSession *macPrintSession) ;
+#else
 OSStatus		UMAPrOpen() ;
 OSStatus		UMAPrClose() ;
+#endif
 
 // window manager
 
@@ -101,6 +110,8 @@ void			UMACloseWindow(WindowRef inWindowRef) ;
 
 void 			UMADrawControl( ControlHandle inControl ) ;
 
+void 			UMAEnableControl( ControlHandle inControl ) ;
+void			UMADisableControl( ControlHandle inControl ) ;
 void 			UMAActivateControl( ControlHandle inControl ) ;
 void			UMADeactivateControl( ControlHandle inControl ) ;
 void			UMAApplyThemeBackground			(ThemeBackgroundKind 	inKind,
@@ -237,7 +248,7 @@ void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate ) ;
 #define GetQDGlobalsBlack( a ) (&((*a) = qd.black))
 #define GetQDGlobalsScreenBits( a ) (*a) = qd.screenBits
 #define GetQDGlobalsArrow( a ) (&((*a) = qd.arrow))
-#define GetControlBounds( c , b ) ((*b) = (**c).contrlRect )
+#define GetControlBounds( c , b ) &((*b) = (**c).contrlRect )
 #define GetPortBitMapForCopyBits( p ) ((BitMap*) &(((CGrafPtr)p)->portPixMap ))
 #endif