X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3cb99894576612e347480d43c5f2e2550b6151cf..4b412d238281008e248bcdebeae4baf4b67191e7:/include/wx/settings.h?ds=sidebyside

diff --git a/include/wx/settings.h b/include/wx/settings.h
index 4d4f680457..a4dc9145c1 100644
--- a/include/wx/settings.h
+++ b/include/wx/settings.h
@@ -29,10 +29,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
@@ -181,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__
@@ -196,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