X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3cb99894576612e347480d43c5f2e2550b6151cf..52170c5b4419c63d6e0083df411aad420395ec98:/include/wx/settings.h?ds=sidebyside diff --git a/include/wx/settings.h b/include/wx/settings.h index 4d4f680457..e49ebcad65 100644 --- a/include/wx/settings.h +++ b/include/wx/settings.h @@ -15,6 +15,8 @@ #include "wx/colour.h" #include "wx/font.h" +class WXDLLIMPEXP_FWD_CORE wxWindow; + // possible values for wxSystemSettings::GetFont() parameter // // NB: wxMSW assumes that they have the same values as the parameters of @@ -29,10 +31,9 @@ enum wxSystemFont wxSYS_DEFAULT_PALETTE, wxSYS_SYSTEM_FIXED_FONT, wxSYS_DEFAULT_GUI_FONT, - wxSYS_ICONTITLE_FONT -#ifndef __WXMSW__ - = wxSYS_DEFAULT_GUI_FONT -#endif + + // this was just a temporary aberration, do not use it any more + wxSYS_ICONTITLE_FONT = wxSYS_DEFAULT_GUI_FONT }; // possible values for wxSystemSettings::GetColour() parameter @@ -82,7 +83,7 @@ enum wxSystemColour wxSYS_COLOUR_MAX }; -// possible values for wxSystemSettings::GetMetric() parameter +// possible values for wxSystemSettings::GetMetric() index parameter // // NB: update the conversion table in msw/settings.cpp if you change the values // of the elements of this enum @@ -124,14 +125,16 @@ enum wxSystemMetric wxSYS_NETWORK_PRESENT, wxSYS_PENWINDOWS_PRESENT, wxSYS_SHOW_SOUNDS, - wxSYS_SWAP_BUTTONS + wxSYS_SWAP_BUTTONS, + wxSYS_DCLICK_MSEC }; // possible values for wxSystemSettings::HasFeature() parameter enum wxSystemFeature { wxSYS_CAN_DRAW_FRAME_DECORATIONS = 1, - wxSYS_CAN_ICONIZE_FRAME + wxSYS_CAN_ICONIZE_FRAME, + wxSYS_TABLET_PRESENT }; // values for different screen designs @@ -166,7 +169,7 @@ public: static wxFont GetFont(wxSystemFont index); // get a system-dependent metric - static int GetMetric(wxSystemMetric index); + static int GetMetric(wxSystemMetric index, wxWindow * win = NULL); // return true if the port has certain feature static bool HasFeature(wxSystemFeature index); @@ -181,7 +184,7 @@ class WXDLLEXPORT wxSystemSettings : public wxSystemSettingsNative public: #ifdef __WXUNIVERSAL__ // in wxUniversal we want to use the theme standard colours instead of the - // system ones, otherwuse wxSystemSettings is just the same as + // system ones, otherwise wxSystemSettings is just the same as // wxSystemSettingsNative static wxColour GetColour(wxSystemColour index); #endif // __WXUNIVERSAL__ @@ -196,15 +199,6 @@ public: // Value static wxSystemScreenType ms_screen; - - // the backwards compatible versions of wxSystemSettingsNative functions, - // don't use these methods in the new code! - static wxColour GetSystemColour(int index) - { return GetColour((wxSystemColour)index); } - static wxFont GetSystemFont(int index) - { return GetFont((wxSystemFont)index); } - static int GetSystemMetric(int index) - { return GetMetric((wxSystemMetric)index); } }; #endif