Updates to fix statusbar and menu errors.

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

diff --git a/include/wx/mac/uma.h b/include/wx/mac/uma.h
index 927be963cd1ba5bed429b84970efb72caa410036..ed8cc1997fc27acbcc0ca1f62f5029e0ce1bd51f 100644 (file)
--- a/include/wx/mac/uma.h
+++ b/include/wx/mac/uma.h
@@ -16,12 +16,24 @@
 
 #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__)
+    #define UMA_USE_APPEARANCE 1
+    #define UMA_USE_WINDOWMGR 1
+    #if defined(__DARWIN__)
+        #include <Carbon/Carbon.h>
+    #endif
 #else
-#define UMA_USE_APPEARANCE 0
-#define UMA_USE_WINDOWMGR 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
@@ -35,6 +47,7 @@
 #endif
 
 void UMAInitToolbox( UInt16 inMoreMastersCalls) ;
+void UMACleanupToolbox() ;
 bool UMAHasAppearance() ;
 long UMAGetAppearanceVersion() ;
 
@@ -69,8 +82,13 @@ void                 UMADrawMenuBar() ;
 void                   UMAShowWatchCursor() ;
 void                   UMAShowArrowCursor() ;
 
-void                   UMAPrOpen() ;
-void                   UMAPrClose() ;
+#if TARGET_CARBON && PM_USE_SESSION_APIS
+OSStatus               UMAPrOpen(PMPrintSession *macPrintSession) ;
+OSStatus               UMAPrClose(PMPrintSession *macPrintSession) ;
+#else
+OSStatus               UMAPrOpen() ;
+OSStatus               UMAPrClose() ;
+#endif
 
 // window manager
 
@@ -92,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,
@@ -228,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
 
@@ -236,4 +256,4 @@ void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate ) ;
 
 OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState ) ;
 
-#endif
\ No newline at end of file
+#endif