From 330b31898350691dfed883dd9d01be4399ade4cc Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 13 Jul 2010 14:13:07 +0000 Subject: [PATCH] Compilation fix for wxUSE_FONTENUM==0 case. Fix another error in minimal wxGTK buildbot build. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/settings.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp index 7de06c56e3..35f0649a37 100644 --- a/src/gtk/settings.cpp +++ b/src/gtk/settings.cpp @@ -258,11 +258,13 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index ) 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; } @@ -273,7 +275,7 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index ) break; } - wxASSERT(font.IsOk() && wxFontEnumerator::IsValidFacename(font.GetFaceName())); + wxASSERT( font.IsOk() ); return font; }