Replaced int with size_t where appropriate, added WXDLLEXPORT, corrected

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

diff --git a/include/wx/mac/uma.h b/include/wx/mac/uma.h
index 6a7de05e46ba586e5d21f379833824ce3f16e9da..7709e2a12af89e15768d510a4a546172e40260b6 100644 (file)
--- a/include/wx/mac/uma.h
+++ b/include/wx/mac/uma.h
@@ -16,11 +16,13 @@
 
 void UMAInitToolbox( UInt16 inMoreMastersCalls) ;
 void UMACleanupToolbox() ;
 
 void UMAInitToolbox( UInt16 inMoreMastersCalls) ;
 void UMACleanupToolbox() ;

+long UMAGetSystemVersion() ;

 bool UMAHasAppearance() ;
 long UMAGetAppearanceVersion() ;
 bool UMAHasWindowManager() ;
 long UMAGetWindowManagerAttr() ;
 bool UMAHasAquaLayout() ;
 bool UMAHasAppearance() ;
 long UMAGetAppearanceVersion() ;
 bool UMAHasWindowManager() ;
 long UMAGetWindowManagerAttr() ;
 bool UMAHasAquaLayout() ;

+bool UMASystemIsInitialized() ;

 
 // process manager
 
 
 // process manager
 


@@ -53,13 +55,8 @@ void                 UMAInsertMenuItem( MenuRef menu , StringPtr label , MenuItemIndex item ,
 void                   UMAShowWatchCursor() ;
 void                   UMAShowArrowCursor() ;
 
 void                   UMAShowWatchCursor() ;
 void                   UMAShowArrowCursor() ;
 

-#if TARGET_CARBON && PM_USE_SESSION_APIS
-OSStatus               UMAPrOpen(PMPrintSession *macPrintSession) ;
-OSStatus               UMAPrClose(PMPrintSession *macPrintSession) ;
-#else
-OSStatus               UMAPrOpen() ;
-OSStatus               UMAPrClose() ;
-#endif
+OSStatus               UMAPrOpen(void *macPrintSession) ;
+OSStatus               UMAPrClose(void *macPrintSession) ;

 
 // window manager
 
 
 // window manager
 


@@ -249,6 +246,7 @@ OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState ) ;
 #define SetListSelectionFlags( list , options ) (**list).selFlags = options
 #define GetListRefCon( list ) (**list).refCon
 */
 #define SetListSelectionFlags( list , options ) (**list).selFlags = options
 #define GetListRefCon( list ) (**list).refCon
 */

+#define GetApplicationScript() smSystemScript

 #else
 
 // calls not in carbon
 #else
 
 // calls not in carbon