font-encodings additions

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/private.h b/include/wx/mac/private.h
index a1a94ae07404f77a5e96d74abbcbe47c8efdd2a9..97c0680bcf393c9250006de9ce9f752c1509fa81 100644 (file)
--- a/include/wx/mac/private.h
+++ b/include/wx/mac/private.h
@@ -182,11 +182,11 @@ public:
        m_release = false ;                                                                 
        }
                                                                       
-    wxMacCFStringHolder(const wxString &str)                                          
+    wxMacCFStringHolder(const wxString &str , wxFontEncoding encoding )                                          
     {      
        m_cfs = NULL ;
        m_release = false ;  
-       Assign( str ) ;                                                               
+       Assign( str , encoding ) ;
     }                                                                       
                                                                             
     wxMacCFStringHolder(CFStringRef ref , bool release = true )                                                   
@@ -199,14 +199,7 @@ public:
     { 
        Release() ;
     }                                           
-      
-    wxMacCFStringHolder& operator=(const wxString& str)                               
-    {                                                                       
-        Release() ;                                                        
-               Assign( str ) ;
-        return *this;                                                       
-    }                                                                       
-             
+
     CFStringRef Detach()
     {
        CFStringRef retval = m_cfs ;
@@ -222,11 +215,12 @@ public:
        m_cfs = NULL ;
     }         
 
+       void Assign( const wxString &str , wxFontEncoding encoding ) ;
+
     operator CFStringRef () { return m_cfs; }   
-    wxString AsString() ;
+    wxString AsString( wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
              
 private:             
-       void Assign( const wxString &str ) ;
                                                               
     CFStringRef m_cfs;
     bool m_release ;                                                        

diff --git a/include/wx/mac/uma.h b/include/wx/mac/uma.h
index 0d4399a04fcaf8fda2dabe907169206aedd4e328..c862427f62eced2c0f6d845c64b74317d12230d2 100644 (file)
--- a/include/wx/mac/uma.h
+++ b/include/wx/mac/uma.h
@@ -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 ) ;