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

Compilation fix for wxUSE_FONTENUM==0 case.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2010-07-13 14:13:07 +00:00
parent 233f573883
commit 330b318983
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gtk/settings.cpp
View File

@@ -258,11 +258,13 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
info.description = ButtonStyle()->font_desc; info.description = ButtonStyle()->font_desc;
gs_fontSystem = wxFont(info); gs_fontSystem = wxFont(info);
#if wxUSE_FONTENUM
// (try to) heal the default font (on some common systems e.g. Ubuntu // (try to) heal the default font (on some common systems e.g. Ubuntu
// it's "Sans Serif" but the real font is called "Sans"): // it's "Sans Serif" but the real font is called "Sans"):
if (!wxFontEnumerator::IsValidFacename(gs_fontSystem.GetFaceName()) && if (!wxFontEnumerator::IsValidFacename(gs_fontSystem.GetFaceName()) &&
gs_fontSystem.GetFaceName() == "Sans Serif") gs_fontSystem.GetFaceName() == "Sans Serif")
gs_fontSystem.SetFaceName("Sans"); gs_fontSystem.SetFaceName("Sans");
#endif // wxUSE_FONTENUM
info.description = NULL; info.description = NULL;
} }
@@ -273,7 +275,7 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
break; break;
} }
wxASSERT(font.IsOk() && wxFontEnumerator::IsValidFacename(font.GetFaceName())); wxASSERT( font.IsOk() );
return font; return font;
} }