X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0ab25937686d2e1c38f62073d84b627b25dda568..8d7ddd02649628327f8169cf2f4f9ee7b52f39c7:/include/wx/mac/uma.h

diff --git a/include/wx/mac/uma.h b/include/wx/mac/uma.h
index 01885e7519..ed8cc1997f 100644
--- a/include/wx/mac/uma.h
+++ b/include/wx/mac/uma.h
@@ -21,10 +21,10 @@
 #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
@@ -82,9 +82,9 @@ void			UMADrawMenuBar() ;
 void			UMAShowWatchCursor() ;
 void			UMAShowArrowCursor() ;
 
-#if PM_USE_SESSION_APIS
-OSStatus		UMAPrOpen(PMPrintSession *macPrintPort) ;
-OSStatus		UMAPrClose(PMPrintSession *macPrintPort) ;
+#if TARGET_CARBON && PM_USE_SESSION_APIS
+OSStatus		UMAPrOpen(PMPrintSession *macPrintSession) ;
+OSStatus		UMAPrClose(PMPrintSession *macPrintSession) ;
 #else
 OSStatus		UMAPrOpen() ;
 OSStatus		UMAPrClose() ;