Last part from weak ref patch for event sink disconnection

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

diff --git a/include/wx/settings.h b/include/wx/settings.h
index a4dc9145c112afc25e342a6a09bda68c12d56a72..e49ebcad65fa4ec5318e471f4344059663263e74 100644 (file)
--- a/include/wx/settings.h
+++ b/include/wx/settings.h
@@ -15,6 +15,8 @@
 #include "wx/colour.h"
 #include "wx/font.h"
 
 #include "wx/colour.h"
 #include "wx/font.h"
 

+class WXDLLIMPEXP_FWD_CORE wxWindow;
+

 // possible values for wxSystemSettings::GetFont() parameter
 //
 // NB: wxMSW assumes that they have the same values as the parameters of
 // possible values for wxSystemSettings::GetFont() parameter
 //
 // NB: wxMSW assumes that they have the same values as the parameters of


@@ -81,7 +83,7 @@ enum wxSystemColour
     wxSYS_COLOUR_MAX
 };
 
     wxSYS_COLOUR_MAX
 };
 

-// possible values for wxSystemSettings::GetMetric() parameter
+// possible values for wxSystemSettings::GetMetric() index parameter

 //
 // NB: update the conversion table in msw/settings.cpp if you change the values
 //     of the elements of this enum
 //
 // NB: update the conversion table in msw/settings.cpp if you change the values
 //     of the elements of this enum


@@ -123,14 +125,16 @@ enum wxSystemMetric
     wxSYS_NETWORK_PRESENT,
     wxSYS_PENWINDOWS_PRESENT,
     wxSYS_SHOW_SOUNDS,
     wxSYS_NETWORK_PRESENT,
     wxSYS_PENWINDOWS_PRESENT,
     wxSYS_SHOW_SOUNDS,

-    wxSYS_SWAP_BUTTONS
+    wxSYS_SWAP_BUTTONS,
+    wxSYS_DCLICK_MSEC

 };
 
 // possible values for wxSystemSettings::HasFeature() parameter
 enum wxSystemFeature
 {
     wxSYS_CAN_DRAW_FRAME_DECORATIONS = 1,
 };
 
 // possible values for wxSystemSettings::HasFeature() parameter
 enum wxSystemFeature
 {
     wxSYS_CAN_DRAW_FRAME_DECORATIONS = 1,

-    wxSYS_CAN_ICONIZE_FRAME
+    wxSYS_CAN_ICONIZE_FRAME,
+    wxSYS_TABLET_PRESENT

 };
 
 // values for different screen designs
 };
 
 // values for different screen designs


@@ -165,7 +169,7 @@ public:
     static wxFont GetFont(wxSystemFont index);
 
     // get a system-dependent metric
     static wxFont GetFont(wxSystemFont index);
 
     // get a system-dependent metric

-    static int GetMetric(wxSystemMetric index);
+    static int GetMetric(wxSystemMetric index, wxWindow * win = NULL);

 
     // return true if the port has certain feature
     static bool HasFeature(wxSystemFeature index);
 
     // return true if the port has certain feature
     static bool HasFeature(wxSystemFeature index);


@@ -195,13 +199,6 @@ public:
     // Value
     static wxSystemScreenType ms_screen;
 
     // 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
 };
 
 #endif