AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

keeping encoding simpler for unicode

Browse Source
This commit is contained in:
Stefan Csomor 2017-06-07 23:02:09 +02:00
parent d28dd3333b
commit 16eac9ed06
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/osx/cocoa/msgdlg.mm
View File

@ -100,13 +100,19 @@ int wxMessageDialog::ShowModal()
CFStringRef alternateButtonTitle = NULL; CFStringRef alternateButtonTitle = NULL;
CFStringRef otherButtonTitle = NULL; CFStringRef otherButtonTitle = NULL;
wxCFStringRef cfTitle( msgtitle, GetFont().GetEncoding() ); #if wxUSE_UNICODE
wxCFStringRef cfText( msgtext, GetFont().GetEncoding() ); wxFontEncoding encoding = wxFONTENCODING_DEFAULT;
#else
wxFontEncoding encoding = GetFont().GetEncoding();
#endif
wxCFStringRef cfNoString( wxControl::GetLabelText(GetNoLabel()), GetFont().GetEncoding() ); wxCFStringRef cfTitle( msgtitle, encoding );
wxCFStringRef cfYesString( wxControl::GetLabelText(GetYesLabel()), GetFont().GetEncoding() ); wxCFStringRef cfText( msgtext, encoding );
wxCFStringRef cfOKString( wxControl::GetLabelText(GetOKLabel()), GetFont().GetEncoding()) ;
wxCFStringRef cfCancelString( wxControl::GetLabelText(GetCancelLabel()), GetFont().GetEncoding() ); wxCFStringRef cfNoString( wxControl::GetLabelText(GetNoLabel()), encoding );
wxCFStringRef cfYesString( wxControl::GetLabelText(GetYesLabel()), encoding );
wxCFStringRef cfOKString( wxControl::GetLabelText(GetOKLabel()), encoding) ;
wxCFStringRef cfCancelString( wxControl::GetLabelText(GetCancelLabel()), encoding );
NSAlertStyle alertType = GetAlertStyleFromWXStyle(style); NSAlertStyle alertType = GetAlertStyleFromWXStyle(style);
@ -238,13 +244,19 @@ void* wxMessageDialog::ConstructNSAlert()
NSAlert* alert = [[NSAlert alloc] init]; NSAlert* alert = [[NSAlert alloc] init];
NSAlertStyle alertType = GetAlertStyleFromWXStyle(style); NSAlertStyle alertType = GetAlertStyleFromWXStyle(style);
wxCFStringRef cfNoString( wxControl::GetLabelText(GetNoLabel()), GetFont().GetEncoding() ); #if wxUSE_UNICODE
wxCFStringRef cfYesString( wxControl::GetLabelText(GetYesLabel()), GetFont().GetEncoding() ); wxFontEncoding encoding = wxFONTENCODING_DEFAULT;
wxCFStringRef cfOKString( wxControl::GetLabelText(GetOKLabel()), GetFont().GetEncoding() ); #else
wxCFStringRef cfCancelString( wxControl::GetLabelText(GetCancelLabel()), GetFont().GetEncoding() ); wxFontEncoding encoding = GetFont().GetEncoding();
#endif
wxCFStringRef cfNoString( wxControl::GetLabelText(GetNoLabel()), encoding );
wxCFStringRef cfYesString( wxControl::GetLabelText(GetYesLabel()), encoding );
wxCFStringRef cfOKString( wxControl::GetLabelText(GetOKLabel()), encoding );
wxCFStringRef cfCancelString( wxControl::GetLabelText(GetCancelLabel()), encoding );
wxCFStringRef cfTitle( msgtitle, GetFont().GetEncoding() ); wxCFStringRef cfTitle( msgtitle, encoding );
wxCFStringRef cfText( msgtext, GetFont().GetEncoding() ); wxCFStringRef cfText( msgtext, encoding );
[alert setMessageText:cfTitle.AsNSString()]; [alert setMessageText:cfTitle.AsNSString()];
[alert setInformativeText:cfText.AsNSString()]; [alert setInformativeText:cfText.AsNSString()];
@ -301,7 +313,7 @@ void* wxMessageDialog::ConstructNSAlert()
if ( style & wxHELP ) if ( style & wxHELP )
{ {
wxCFStringRef cfHelpString( GetHelpLabel(), GetFont().GetEncoding() ); wxCFStringRef cfHelpString( GetHelpLabel(), encoding );
[alert addButtonWithTitle:cfHelpString.AsNSString()]; [alert addButtonWithTitle:cfHelpString.AsNSString()];
m_buttonId[ m_buttonCount++ ] = wxID_HELP; m_buttonId[ m_buttonCount++ ] = wxID_HELP;
} }