Added DECLARE_LOCAL_EVENT_TYPE which doesn't use WXDLLEXPORT. This is

[wxWidgets.git] / include / wx / mac / uma.h

diff --git a/include/wx/mac/uma.h b/include/wx/mac/uma.h
index 927be963cd1ba5bed429b84970efb72caa410036..0898dc057a32919702ef22f4cbf65a08a4c60cd5 100644 (file)
--- a/include/wx/mac/uma.h
+++ b/include/wx/mac/uma.h
@@ -16,12 +16,20 @@
 
 #define UMA_USE_8_6 0 
 
-#if defined(__POWERPC__) || defined(__MACH__)
-#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