X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4676948b6814c97b93c431a8cbcd8c0352c87ba9..b5df4fc722412fe5f6764c490925b26293c5f662:/src/msw/settings.cpp diff --git a/src/msw/settings.cpp b/src/msw/settings.cpp index 1c5c52d672..13dbf8e2d2 100644 --- a/src/msw/settings.cpp +++ b/src/msw/settings.cpp @@ -40,6 +40,10 @@ #include "wx/module.h" #include "wx/fontutil.h" +#ifdef __WXWINCE__ // for SM_CXCURSOR and SM_CYCURSOR +#include "wx/msw/wince/missing.h" +#endif // __WXWINCE__ + // ---------------------------------------------------------------------------- // private classes // ---------------------------------------------------------------------------- @@ -200,7 +204,11 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index) if ( !hasCol ) { +#ifdef __WXWINCE__ + colSys = ::GetSysColor(index|SYS_COLOR_INDEX_FLAG); +#else colSys = ::GetSysColor(index); +#endif } return wxRGBToColour(colSys); @@ -246,6 +254,16 @@ wxFont wxCreateFontFromStockObject(int index) wxFont wxSystemSettingsNative::GetFont(wxSystemFont index) { +#ifndef __WXWINCE__ + // this one is special: we don't get it from GetStockObject() + if ( index == wxSYS_ICONTITLE_FONT ) + { + LOGFONT lf; + SystemParametersInfo(SPI_GETICONTITLELOGFONT, sizeof(lf), &lf, 0); + return wxCreateFontFromLogFont(&lf); + } +#endif // __WXWINCE__ + // wxWindow ctor calls GetSystemFont(wxSYS_DEFAULT_GUI_FONT) so we're // called fairly often - this is why we cache this particular font bool isDefaultRequested = index == wxSYS_DEFAULT_GUI_FONT;