]> git.saurik.com Git - wxWidgets.git/commitdiff
Compilation fix for wxUSE_FONTENUM==0 case.
authorVadim Zeitlin <vadim@wxwidgets.org>
Tue, 13 Jul 2010 14:13:07 +0000 (14:13 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Tue, 13 Jul 2010 14:13:07 +0000 (14:13 +0000)
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

index 7de06c56e34fdf9535462bc6bb9776eff7adec82..35f0649a375f602ff8e443a2ba81b8e5b18e3266 100644 (file)
@@ -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;
 }