Added wxUSE_NUMBERDLG to setup.h; added some files to VC++ project files;

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

diff --git a/include/wx/mac/uma.h b/include/wx/mac/uma.h
index 937ef9d0f78d8008f93f16c230019000fdfaac49..01885e751968e5cc68fbc39740d83db8f269cb0a 100644 (file)
--- a/include/wx/mac/uma.h
+++ b/include/wx/mac/uma.h
@@ -82,8 +82,13 @@ void                 UMADrawMenuBar() ;
 void                   UMAShowWatchCursor() ;
 void                   UMAShowArrowCursor() ;
 
+#if PM_USE_SESSION_APIS
+OSStatus               UMAPrOpen(PMPrintSession *macPrintPort) ;
+OSStatus               UMAPrClose(PMPrintSession *macPrintPort) ;
+#else
 OSStatus               UMAPrOpen() ;
 OSStatus               UMAPrClose() ;
+#endif
 
 // window manager
 
@@ -243,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