X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/05adb9d2fdc40d8620730be490bf406b8e367cf8..960ba969f9b7e004cfa7bd1ea26e953dbc159f8c:/include/wx/mac/uma.h

diff --git a/include/wx/mac/uma.h b/include/wx/mac/uma.h
index ddaba6ed30..0898dc057a 100644
--- a/include/wx/mac/uma.h
+++ b/include/wx/mac/uma.h
@@ -6,7 +6,7 @@
 // Created:     03/02/99
 // RCS-ID:      $Id: 
 // Copyright:   (c) Stefan Csomor
-// Licence:   	LGPL licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef H_UMA
@@ -16,12 +16,20 @@
 
 #define UMA_USE_8_6 0 
 
-#if __POWERPC__
-#define UMA_USE_APPEARANCE 1
-#define UMA_USE_WINDOWMGR 1
+#if TARGET_CARBON
+#undef UMA_USE_8_6
+#define UMA_USE_8_6 1 
+#endif
+
+#if defined(__POWERPC__) || defined(__APPLE__)
+    #define UMA_USE_APPEARANCE 1
+    #define UMA_USE_WINDOWMGR 1
+    #if defined(__APPLE__)
+        #include <Carbon/Carbon.h>
+    #endif
 #else
-#define UMA_USE_APPEARANCE 0
-#define UMA_USE_WINDOWMGR 0
+    #define UMA_USE_APPEARANCE 0
+    #define UMA_USE_WINDOWMGR 0
 #endif
 
 #if !UMA_USE_8_6 && UMA_USE_WINDOWMGR
@@ -35,6 +43,7 @@
 #endif
 
 void UMAInitToolbox( UInt16 inMoreMastersCalls) ;
+void UMACleanupToolbox() ;
 bool UMAHasAppearance() ;
 long UMAGetAppearanceVersion() ;
 
@@ -69,8 +78,8 @@ void			UMADrawMenuBar() ;
 void			UMAShowWatchCursor() ;
 void			UMAShowArrowCursor() ;
 
-void			UMAPrOpen() ;
-void			UMAPrClose() ;
+OSStatus		UMAPrOpen() ;
+OSStatus		UMAPrClose() ;
 
 // window manager
 
@@ -236,4 +245,4 @@ void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate ) ;
 
 OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState ) ;
 
-#endif
\ No newline at end of file
+#endif