diff --git a/include/wx/gtk/fontpicker.h b/include/wx/gtk/fontpicker.h index 65bb5c9593..606f944152 100644 --- a/include/wx/gtk/fontpicker.h +++ b/include/wx/gtk/fontpicker.h @@ -52,7 +52,7 @@ protected: public: // used by the GTK callback only void SetNativeFontInfo(const char *gtkdescription) - { m_selectedFont.SetNativeFontInfo(wxString::FromAscii(gtkdescription)); } + { m_selectedFont.SetNativeFontInfo(wxString::FromUTF8(gtkdescription)); } private: DECLARE_DYNAMIC_CLASS(wxFontButton) diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp index 30409cd133..3352965683 100644 --- a/src/gtk/control.cpp +++ b/src/gtk/control.cpp @@ -301,8 +301,10 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget, if (!font_name) attr.font = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ); else - attr.font = wxFont(wxString::FromAscii(font_name)); - g_free (font_name); + { + attr.font = wxFont(wxString::FromUTF8(font_name)); + g_free(font_name); + } } if (tlw)