X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e40298d54ecd5b109222a7c60aa2ef084a304d69..999836aacade840a5d9a0cbb5fad7b1d4de62c93:/include/wx/mac/uma.h

diff --git a/include/wx/mac/uma.h b/include/wx/mac/uma.h
index f96f5d42a5..0b665d5d4c 100644
--- a/include/wx/mac/uma.h
+++ b/include/wx/mac/uma.h
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     03/02/99
-// RCS-ID:      $Id: 
+// RCS-ID:      $Id:
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -22,13 +22,17 @@ long UMAGetAppearanceVersion() ;
 bool UMAHasWindowManager() ;
 long UMAGetWindowManagerAttr() ;
 bool UMAHasAquaLayout() ;
+
 bool UMASystemIsInitialized() ;
+void UMASetSystemIsInitialized(bool val);
 
 // process manager
 
 long UMAGetProcessMode() ;
 bool UMAGetProcessModeDoesActivateOnFGSwitch() ;
 
+#if wxUSE_GUI
+
 // menu manager
 
 MenuRef         UMANewMenu( SInt16 id , const wxString& title ) ;
@@ -49,14 +53,16 @@ void            UMASetMenuItemText(  MenuRef menu,  MenuItemIndex item, const wx
 void            UMAShowWatchCursor() ;
 void            UMAShowArrowCursor() ;
 
-OSStatus        UMAPrOpen(void *macPrintSession) ;
-OSStatus        UMAPrClose(void *macPrintSession) ;
+#if !TARGET_CARBON
+OSStatus        UMAPrOpen() ;
+OSStatus        UMAPrClose() ;
+#endif
 
 // window manager
 
 GrafPtr        UMAGetWindowPort( WindowRef inWindowRef ) ;
 void             UMADisposeWindow( WindowRef inWindowRef ) ;
-void             UMASetWTitleC( WindowRef inWindowRef , const char *title ) ;
+void             UMASetWTitle( WindowRef inWindowRef , const wxString& title ) ;
 void             UMAGetWTitleC( WindowRef inWindowRef , char *title ) ;
 
 void             UMADrawGrowIcon( WindowRef inWindowRef ) ;
@@ -75,6 +81,7 @@ void UMAShowControl                        (ControlHandle             theControl
 void UMAHideControl                        (ControlHandle             theControl);
 void UMAActivateControl                    (ControlHandle             inControl);
 void UMADeactivateControl                (ControlHandle             inControl);
+void UMASetControlTitle( ControlHandle inControl , const wxString& title ) ;
 
 void UMAMoveControl( ControlHandle inControl , short x , short y ) ;
 void UMASizeControl( ControlHandle inControl , short x , short y ) ;
@@ -118,6 +125,8 @@ OSStatus UMAPutScrap( Size size , OSType type , void *data ) ;
 // calls not in carbon
 
 #endif
-#define GetWindowUpdateRgn( inWindow , updateRgn ) GetWindowRegion( inWindow , kWindowUpdateRgn, updateRgn ) 
+#define GetWindowUpdateRgn( inWindow , updateRgn ) GetWindowRegion( inWindow , kWindowUpdateRgn, updateRgn )
+
+#endif // wxUSE_GUI
 
 #endif