X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..b08cd3bf53901e3180e0ee60376807563c828495:/include/wx/settings.h diff --git a/include/wx/settings.h b/include/wx/settings.h index 0386b2e6e7..a4dc9145c1 100644 --- a/include/wx/settings.h +++ b/include/wx/settings.h @@ -6,7 +6,7 @@ // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_SETTINGS_H_BASE_ @@ -180,7 +180,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__ @@ -195,15 +195,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