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

use the encoding of the font which is used to draw the text when convering it to UTF-8 in wxGTK_CONV; the old wxGTK_CONV renamed to wxGTK_CONV_SYS (uses system encoding) and used in the contexts where no font is available

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-04-10 22:22:13 +00:00
parent 0e05227246
commit 5f11fef543
7 changed files with 57 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/unix/fontutil.cpp
View File

@@ -256,7 +256,7 @@ void wxNativeFontInfo::SetUnderlined(bool WXUNUSED(underlined))
void wxNativeFontInfo::SetFaceName(const wxString& facename)
{
pango_font_description_set_family( description, wxGTK_CONV(facename) );
pango_font_description_set_family(description, wxGTK_CONV_SYS(facename));
}
void wxNativeFontInfo::SetFamily(wxFontFamily WXUNUSED(family))
@@ -276,7 +276,7 @@ bool wxNativeFontInfo::FromString(const wxString& s)
if (description)
pango_font_description_free( description );
description = pango_font_description_from_string( wxGTK_CONV( s ) );
description = pango_font_description_from_string( wxGTK_CONV_SYS( s ) );
return true;
}