X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e3527f7bc58048611c213a801b20c3d03664c225..4776c0b783a9776f94b049aecdc253d379686b6b:/src/gtk/settings.cpp diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp index 89cb46dbad..35f0649a37 100644 --- a/src/gtk/settings.cpp +++ b/src/gtk/settings.cpp @@ -228,7 +228,7 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index ) case wxSYS_COLOUR_MAX: default: - wxFAIL_MSG( _T("unknown system colour index") ); + wxFAIL_MSG( wxT("unknown system colour index") ); color = *wxWHITE; break; } @@ -257,13 +257,15 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index ) wxNativeFontInfo info; info.description = ButtonStyle()->font_desc; gs_fontSystem = wxFont(info); - + +#if wxUSE_FONTENUM // (try to) heal the default font (on some common systems e.g. Ubuntu // it's "Sans Serif" but the real font is called "Sans"): if (!wxFontEnumerator::IsValidFacename(gs_fontSystem.GetFaceName()) && gs_fontSystem.GetFaceName() == "Sans Serif") gs_fontSystem.SetFaceName("Sans"); - +#endif // wxUSE_FONTENUM + info.description = NULL; } font = gs_fontSystem; @@ -273,7 +275,7 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index ) break; } - wxASSERT(font.IsOk() && wxFontEnumerator::IsValidFacename(font.GetFaceName())); + wxASSERT( font.IsOk() ); return font; }