Apply [ 1713345 ] combobox: cmd accelerators shouldn't steal editing hotkeys

[wxWidgets.git] / include / wx / settings.h

diff --git a/include/wx/settings.h b/include/wx/settings.h
index 24cee957a2385d3a211139a6e3f9921ce2fea4e1..304c225e30c61a60303063d21e34ce0a53d380e9 100644 (file)
--- a/include/wx/settings.h
+++ b/include/wx/settings.h
@@ -132,7 +132,8 @@ enum wxSystemMetric
 enum wxSystemFeature
 {
     wxSYS_CAN_DRAW_FRAME_DECORATIONS = 1,
-    wxSYS_CAN_ICONIZE_FRAME
+    wxSYS_CAN_ICONIZE_FRAME,
+    wxSYS_TABLET_PRESENT
 };
 
 // values for different screen designs
@@ -197,13 +198,6 @@ 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!
-    wxDEPRECATED(static wxColour GetSystemColour(int index));
-    wxDEPRECATED(static wxFont GetSystemFont(int index));
-    wxDEPRECATED(static int GetSystemMetric(int index));
-#endif
 };
 
 #endif