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

Support encodings in wxGTK_CONV_BACK() in the same way as we do it in

Browse Source 
wxGTK_CONV(), i.e. return the string containing text in ISO-8859-1 encoding
and not UTF-8 if the controls font was set to have ISO-8859-1 encoding


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-02-27 15:41:56 +00:00
parent c0da0dbabf
commit 30083ad8e7
7 changed files with 59 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/unix/fontutil.cpp
View File

@@ -136,9 +136,7 @@ bool wxNativeFontInfo::GetUnderlined() const
wxString wxNativeFontInfo::GetFaceName() const
{
wxString tmp = wxGTK_CONV_BACK( pango_font_description_get_family( description ) );
return tmp;
return wxGTK_CONV_BACK_SYS(pango_font_description_get_family(description));
}
wxFontFamily wxNativeFontInfo::GetFamily() const
@@ -327,7 +325,7 @@ wxString wxNativeFontInfo::ToString() const
{
wxGtkString str(pango_font_description_to_string( description ));
return wxGTK_CONV_BACK(str);
return wxGTK_CONV_BACK_SYS(str);
}
bool wxNativeFontInfo::FromUserString(const wxString& s)