compilation fix

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

diff --git a/include/wx/mac/uma.h b/include/wx/mac/uma.h
index f96f5d42a526d97364b357f31985742196f0e66c..2587f1b2c18fd0a6f45da9e2e6dff56b24c99ff7 100644 (file)
--- a/include/wx/mac/uma.h
+++ b/include/wx/mac/uma.h
@@ -49,14 +49,16 @@ void            UMASetMenuItemText(  MenuRef menu,  MenuItemIndex item, const wx
 void            UMAShowWatchCursor() ;
 void            UMAShowArrowCursor() ;
 
 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 ) ;
 
 // 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 ) ;
 void             UMAGetWTitleC( WindowRef inWindowRef , char *title ) ;
 
 void             UMADrawGrowIcon( WindowRef inWindowRef ) ;


@@ -75,6 +77,7 @@ void UMAShowControl                        (ControlHandle             theControl
 void UMAHideControl                        (ControlHandle             theControl);
 void UMAActivateControl                    (ControlHandle             inControl);
 void UMADeactivateControl                (ControlHandle             inControl);
 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 ) ;
 
 void UMAMoveControl( ControlHandle inControl , short x , short y ) ;
 void UMASizeControl( ControlHandle inControl , short x , short y ) ;