X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b4772c241f010306b6f9e93edd2dabe763ff9c40..99cc862c0fd5fb21152854075808cf82a3a2025d:/src/msw/settings.cpp diff --git a/src/msw/settings.cpp b/src/msw/settings.cpp index 602d3f8e62..76d77a96bf 100644 --- a/src/msw/settings.cpp +++ b/src/msw/settings.cpp @@ -172,7 +172,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index) index = wxSYS_COLOUR_MENU ; } } - } + } if ( useDefault ) { @@ -225,12 +225,13 @@ wxFont wxCreateFontFromStockObject(int index) { wxNativeFontInfo info; info.lf = lf; +#ifndef __WXWINCE__ // We want Windows 2000 or later to have new fonts even MS Shell Dlg // is returned as default GUI font for compatibility int verMaj; if(index == DEFAULT_GUI_FONT && wxGetOsVersion(&verMaj) == wxWINDOWS_NT && verMaj >= 5) wxStrcpy(info.lf.lfFaceName, wxT("MS Shell Dlg 2")); - +#endif // Under MicroWindows we pass the HFONT as well // because it's hard to convert HFONT -> LOGFONT -> HFONT // It's OK to delete stock objects, the delete will be ignored.