From 925fe73a2011489791a038f6eac5eac2439be40f Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Tue, 8 Jan 2002 23:25:53 +0000 Subject: [PATCH] backward-compatiblity functions must go to wxSystemSettings, otherwise (non-virtual) wxSSNative version would be used :( git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/settings.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/include/wx/settings.h b/include/wx/settings.h index b4c0d8598e..8266bce440 100644 --- a/include/wx/settings.h +++ b/include/wx/settings.h @@ -149,16 +149,6 @@ 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); } }; // ---------------------------------------------------------------------------- @@ -174,6 +164,16 @@ public: // wxSystemSettingsNative static wxColour GetColour(wxSystemColour index); #endif // __WXUNIVERSAL__ + + + // 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 -- 2.45.2