X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a83f860948059b0273b5cc6d9e43fadad3ebfca..69d31e313035d5e22d9400ec946f6007f710910c:/src/msw/settings.cpp diff --git a/src/msw/settings.cpp b/src/msw/settings.cpp index 9925692052..ea2e76c0c0 100644 --- 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__ }