X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2dbc444a1986c63f8e41731fd75f92c43e6af4da..35c40e78c67ec08cbb1b861dfb86bc52fe1b9a45:/include/wx/mac/uma.h

diff --git a/include/wx/mac/uma.h b/include/wx/mac/uma.h
index 0b665d5d4c..c862427f62 100644
--- a/include/wx/mac/uma.h
+++ b/include/wx/mac/uma.h
@@ -14,7 +14,7 @@
 
 #include "wx/mac/private.h"
 
-void UMAInitToolbox( UInt16 inMoreMastersCalls) ;
+void UMAInitToolbox( UInt16 inMoreMastersCalls, bool isEmbedded) ;
 void UMACleanupToolbox() ;
 long UMAGetSystemVersion() ;
 bool UMAHasAppearance() ;
@@ -35,18 +35,18 @@ bool UMAGetProcessModeDoesActivateOnFGSwitch() ;
 
 // menu manager
 
-MenuRef         UMANewMenu( SInt16 id , const wxString& title ) ;
-void             UMASetMenuTitle( MenuRef menu , const wxString& title ) ;
+MenuRef         UMANewMenu( SInt16 id , const wxString& title , wxFontEncoding encoding) ;
+void             UMASetMenuTitle( MenuRef menu , const wxString& title , wxFontEncoding encoding) ;
 UInt32             UMAMenuEvent( EventRecord *inEvent ) ;
 void             UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex item , bool enable ) ;
 
-void            UMAAppendSubMenuItem( MenuRef menu , const wxString& title , SInt16 submenuid ) ;
-void            UMAInsertSubMenuItem( MenuRef menu , const wxString& title , MenuItemIndex item , SInt16 submenuid  ) ;
-void            UMAAppendMenuItem( MenuRef menu , const wxString& title , wxAcceleratorEntry *entry = NULL  ) ;
-void            UMAInsertMenuItem( MenuRef menu , const wxString& title , MenuItemIndex item , wxAcceleratorEntry *entry = NULL ) ;
+void            UMAAppendSubMenuItem( MenuRef menu , const wxString& title , wxFontEncoding encoding , SInt16 submenuid ) ;
+void            UMAInsertSubMenuItem( MenuRef menu , const wxString& title , wxFontEncoding encoding , MenuItemIndex item , SInt16 submenuid ) ;
+void            UMAAppendMenuItem( MenuRef menu , const wxString& title , wxFontEncoding encoding , wxAcceleratorEntry *entry = NULL  ) ;
+void            UMAInsertMenuItem( MenuRef menu , const wxString& title , wxFontEncoding encoding , MenuItemIndex item , wxAcceleratorEntry *entry = NULL ) ;
 void             UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEntry *entry ) ;
 
-void            UMASetMenuItemText(  MenuRef menu,  MenuItemIndex item, const wxString& title ) ;
+void            UMASetMenuItemText(  MenuRef menu,  MenuItemIndex item, const wxString& title , wxFontEncoding encoding ) ;
 
 // quickdraw
 
@@ -62,8 +62,7 @@ OSStatus        UMAPrClose() ;
 
 GrafPtr        UMAGetWindowPort( WindowRef inWindowRef ) ;
 void             UMADisposeWindow( WindowRef inWindowRef ) ;
-void             UMASetWTitle( WindowRef inWindowRef , const wxString& title ) ;
-void             UMAGetWTitleC( WindowRef inWindowRef , char *title ) ;
+void             UMASetWTitle( WindowRef inWindowRef , const wxString& title , wxFontEncoding encoding) ;
 
 void             UMADrawGrowIcon( WindowRef inWindowRef ) ;
 void            UMAShowHide( WindowRef inWindowRef , Boolean show) ;
@@ -81,7 +80,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 UMASetControlTitle( ControlHandle inControl , const wxString& title , wxFontEncoding encoding) ;
 
 void UMAMoveControl( ControlHandle inControl , short x , short y ) ;
 void UMASizeControl( ControlHandle inControl , short x , short y ) ;