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

wxMac Unicode support

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-03-27 20:33:32 +00:00
parent 44c44c82a3
commit 427ff66291
99 changed files with 1718 additions and 2166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/mac/uma.cpp
View File

@@ -189,10 +189,8 @@ MenuRef UMANewMenu( SInt16 id , const wxString& title )
wxString str = wxStripMenuCodes( title ) ;
MenuRef menu ;
#if TARGET_CARBON
CFStringRef cfs = wxMacCreateCFString( str ) ;
CreateNewMenu( id , 0 , &menu ) ;
SetMenuTitleWithCFString( menu , cfs ) ;
CFRelease( cfs ) ;
SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str) ) ;
#else
Str255 ptitle ;
wxMacStringToPascal( str , ptitle ) ;
@@ -205,9 +203,7 @@ void UMASetMenuTitle( MenuRef menu , const wxString& title )
{
wxString str = wxStripMenuCodes( title ) ;
#if TARGET_CARBON
CFStringRef cfs = wxMacCreateCFString( str ) ;
SetMenuTitleWithCFString( menu , cfs ) ;
CFRelease( cfs ) ;
SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str) ) ;
#else
Str255 ptitle ;
wxMacStringToPascal( str , ptitle ) ;
@@ -219,9 +215,7 @@ void UMASetMenuItemText( MenuRef menu, MenuItemIndex item, const wxString& tit
{
wxString str = wxStripMenuCodes( title ) ;
#if TARGET_CARBON
CFStringRef cfs = wxMacCreateCFString( str ) ;
SetMenuItemTextWithCFString( menu , item , cfs ) ;
CFRelease( cfs ) ;
SetMenuItemTextWithCFString( menu , item , wxMacCFStringHolder(str) ) ;
#else
Str255 ptitle ;
wxMacStringToPascal( str , ptitle ) ;
@@ -558,17 +552,15 @@ void UMADisposeWindow( WindowRef inWindowRef )
DisposeWindow( inWindowRef ) ;
}
void UMASetWTitleC( WindowRef inWindowRef , const char *title )
void UMASetWTitle( WindowRef inWindowRef , const wxString& title )
{
Str255 ptitle ;
strncpy( (char*)ptitle , title , 96 ) ;
ptitle[96] = 0 ;
#if TARGET_CARBON
c2pstrcpy( ptitle, (char *)ptitle ) ;
SetWindowTitleWithCFString( inWindowRef , wxMacCFStringHolder(title) ) ;
#else
c2pstr( (char*)ptitle ) ;
#endif
Str255 ptitle ;
wxMacStringToPascal( title , ptitle ) ;
SetWTitle( inWindowRef , ptitle ) ;
#endif
}
void UMAGetWTitleC( WindowRef inWindowRef , char *title )
@@ -583,6 +575,17 @@ void UMAGetWTitleC( WindowRef inWindowRef , char *title )
// appearance additions
void UMASetControlTitle( ControlHandle inControl , const wxString& title )
{
#if TARGET_CARBON
SetControlTitleWithCFString( inControl , wxMacCFStringHolder(title) ) ;
#else
Str255 ptitle ;
wxMacStringToPascal( title , ptitle ) ;
SetControlTitle( inControl , ptitle ) ;
#endif
}
void UMAActivateControl( ControlHandle inControl )
{
// we have to add the control after again to the update rgn
@@ -795,7 +798,7 @@ void wxMacPortStateHelper::Setup( GrafPtr newport )
{
GetPort( &m_oldPort ) ;
SetPort( newport ) ;
wxASSERT_MSG( m_clip == NULL , "Cannot call setup twice" ) ;
wxASSERT_MSG( m_clip == NULL , wxT("Cannot call setup twice") ) ;
m_clip = NewRgn() ;
GetClip( m_clip );
m_textFont = GetPortTextFont( (CGrafPtr) newport);