X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/371a5b4e62eb415107e045588f614fa49e866e78..73302af6dddd667af4ebec69c800bc9de106f28e:/include/wx/settings.h?ds=inline diff --git a/include/wx/settings.h b/include/wx/settings.h index 168db483f2..24cee957a2 100644 --- a/include/wx/settings.h +++ b/include/wx/settings.h @@ -15,6 +15,8 @@ #include "wx/colour.h" #include "wx/font.h" +class WXDLLEXPORT wxWindow; + // possible values for wxSystemSettings::GetFont() parameter // // NB: wxMSW assumes that they have the same values as the parameters of @@ -28,7 +30,10 @@ enum wxSystemFont wxSYS_DEVICE_DEFAULT_FONT, wxSYS_DEFAULT_PALETTE, wxSYS_SYSTEM_FIXED_FONT, - wxSYS_DEFAULT_GUI_FONT + wxSYS_DEFAULT_GUI_FONT, + + // 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 @@ -78,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 @@ -162,7 +167,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); @@ -177,7 +182,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__ @@ -192,15 +197,13 @@ public: // Value static wxSystemScreenType ms_screen; - +#if WXWIN_COMPATIBILITY_2_4 // 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); } + wxDEPRECATED(static wxColour GetSystemColour(int index)); + wxDEPRECATED(static wxFont GetSystemFont(int index)); + wxDEPRECATED(static int GetSystemMetric(int index)); +#endif }; #endif