Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

font-encodings additions

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-02-08 06:19:37 +00:00
parent 1d1ed4087d
commit af3aefcf06
2 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/wx/mac/private.h
View File

@@ -182,11 +182,11 @@ public:
m_release = false ; m_release = false ;
} }
wxMacCFStringHolder(const wxString &str) wxMacCFStringHolder(const wxString &str , wxFontEncoding encoding )
{ {
m_cfs = NULL ; m_cfs = NULL ;
m_release = false ; m_release = false ;
Assign( str ) ; Assign( str , encoding ) ;
} }
wxMacCFStringHolder(CFStringRef ref , bool release = true ) wxMacCFStringHolder(CFStringRef ref , bool release = true )
@@ -199,14 +199,7 @@ public:
{ {
Release() ; Release() ;
} }
wxMacCFStringHolder& operator=(const wxString& str)
{
Release() ;
Assign( str ) ;
return *this;
}
CFStringRef Detach() CFStringRef Detach()
{ {
CFStringRef retval = m_cfs ; CFStringRef retval = m_cfs ;
@@ -222,11 +215,12 @@ public:
m_cfs = NULL ; m_cfs = NULL ;
} }
void Assign( const wxString &str , wxFontEncoding encoding ) ;
operator CFStringRef () { return m_cfs; } operator CFStringRef () { return m_cfs; }
wxString AsString() ; wxString AsString( wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
private: private:
void Assign( const wxString &str ) ;
CFStringRef m_cfs; CFStringRef m_cfs;
bool m_release ; bool m_release ;

19
include/wx/mac/uma.h
View File

@@ -35,18 +35,18 @@ bool UMAGetProcessModeDoesActivateOnFGSwitch() ;
// menu manager // menu manager
MenuRef UMANewMenu( SInt16 id , const wxString& title ) ; MenuRef UMANewMenu( SInt16 id , const wxString& title , wxFontEncoding encoding) ;
void UMASetMenuTitle( MenuRef menu , const wxString& title ) ; void UMASetMenuTitle( MenuRef menu , const wxString& title , wxFontEncoding encoding) ;
UInt32 UMAMenuEvent( EventRecord *inEvent ) ; UInt32 UMAMenuEvent( EventRecord *inEvent ) ;
void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex item , bool enable ) ; void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex item , bool enable ) ;
void UMAAppendSubMenuItem( MenuRef menu , const wxString& title , SInt16 submenuid ) ; void UMAAppendSubMenuItem( MenuRef menu , const wxString& title , wxFontEncoding encoding , SInt16 submenuid ) ;
void UMAInsertSubMenuItem( MenuRef menu , const wxString& title , MenuItemIndex item , SInt16 submenuid ) ; void UMAInsertSubMenuItem( MenuRef menu , const wxString& title , wxFontEncoding encoding , MenuItemIndex item , SInt16 submenuid ) ;
void UMAAppendMenuItem( MenuRef menu , const wxString& title , wxAcceleratorEntry *entry = NULL ) ; void UMAAppendMenuItem( MenuRef menu , const wxString& title , wxFontEncoding encoding , wxAcceleratorEntry *entry = NULL ) ;
void UMAInsertMenuItem( MenuRef menu , const wxString& title , MenuItemIndex item , 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 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 // quickdraw
@@ -62,8 +62,7 @@ OSStatus UMAPrClose() ;
GrafPtr UMAGetWindowPort( WindowRef inWindowRef ) ; GrafPtr UMAGetWindowPort( WindowRef inWindowRef ) ;
void UMADisposeWindow( WindowRef inWindowRef ) ; void UMADisposeWindow( WindowRef inWindowRef ) ;
void UMASetWTitle( WindowRef inWindowRef , const wxString& title ) ; void UMASetWTitle( WindowRef inWindowRef , const wxString& title , wxFontEncoding encoding) ;
void UMAGetWTitleC( WindowRef inWindowRef , char *title ) ;
void UMADrawGrowIcon( WindowRef inWindowRef ) ; void UMADrawGrowIcon( WindowRef inWindowRef ) ;
void UMAShowHide( WindowRef inWindowRef , Boolean show) ; void UMAShowHide( WindowRef inWindowRef , Boolean show) ;
@@ -81,7 +80,7 @@ void UMAShowControl (ControlHandle theControl
void UMAHideControl (ControlHandle theControl); void UMAHideControl (ControlHandle theControl);
void UMAActivateControl (ControlHandle inControl); void UMAActivateControl (ControlHandle inControl);
void UMADeactivateControl (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 UMAMoveControl( ControlHandle inControl , short x , short y ) ;
void UMASizeControl( ControlHandle inControl , short x , short y ) ; void UMASizeControl( ControlHandle inControl , short x , short y ) ;