Output the extracted number from wxString::ToXXX() even if it returns false.

[wxWidgets.git] / src / msw / settings.cpp

diff --git a/src/msw/settings.cpp b/src/msw/settings.cpp
index 99256920522702e789e10319216ed79e2e15a922..ea2e76c0c08ce85dcf349bb5be47f926377b7eda 100644 (file)
--- a/src/msw/settings.cpp
+++ b/src/msw/settings.cpp
@@ -208,7 +208,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
         colSys = ::GetSysColor(index);
 #endif
     }
-    
+
     wxColour ret = wxRGBToColour(colSys);
     wxASSERT(ret.IsOk());
     return ret;
@@ -270,7 +270,7 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
         gs_fontDefault = new wxFont(wxCreateFontFromStockObject(SYSTEM_FONT));
     }
 
-    wxASSERT(gs_fontDefault->IsOk() && 
+    wxASSERT(gs_fontDefault->IsOk() &&
              wxFontEnumerator::IsValidFacename(gs_fontDefault->GetFaceName()));
     return *gs_fontDefault;
 #else // !__WXWINCE__
@@ -291,7 +291,12 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
         gs_fontDefault = new wxFont(font);
     }
 
-    wxASSERT(font.IsOk() && wxFontEnumerator::IsValidFacename(font.GetFaceName()));
+    wxASSERT(font.IsOk());
+
+#if wxUSE_FONTENUM
+    wxASSERT(wxFontEnumerator::IsValidFacename(font.GetFaceName()));
+#endif // wxUSE_FONTENUM
+
     return font;
 #endif // __WXWINCE__/!__WXWINCE__
 }