X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a103111baede60d2670479471cd5b620c04c885b..42dcacf02b163699d4623097c4d04980f11d9040:/include/wx/settings.h

diff --git a/include/wx/settings.h b/include/wx/settings.h
index 00deb9977c..8266bce440 100644
--- a/include/wx/settings.h
+++ b/include/wx/settings.h
@@ -149,27 +149,12 @@ public:
 
     // return true if the port has certain feature
     static bool HasFeature(wxSystemFeature index);
-
-
-    // the backwards compatible versions, 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); }
 };
 
 // ----------------------------------------------------------------------------
 // include the declaration of the real platform-dependent class
 // ----------------------------------------------------------------------------
 
-// TODO: this should go away once wxOS2 has been updated to use wxSSNative
-#if defined(__WXPM__)
-    #include "wx/os2/settings.h"
-#else
-
 class wxSystemSettings : public wxSystemSettingsNative
 {
 public:
@@ -179,9 +164,17 @@ public:
     // wxSystemSettingsNative
     static wxColour GetColour(wxSystemColour index);
 #endif // __WXUNIVERSAL__
-};
 
-#endif // ! __WXPM__
+
+    // 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
     // _WX_SETTINGS_H_BASE_