disown wxPyXmlResourceHandler

[wxWidgets.git] / wxPython / src / _settings.i

diff --git a/wxPython/src/_settings.i b/wxPython/src/_settings.i
index b4bc618260cb6060abcd62ab7357f9281908caa6..f45d1fe3b9b0babdc9ceb76d3778dd250debe81b 100644 (file)
--- a/wxPython/src/_settings.i
+++ b/wxPython/src/_settings.i
@@ -129,7 +129,8 @@ enum wxSystemMetric
 enum wxSystemFeature
 {
     wxSYS_CAN_DRAW_FRAME_DECORATIONS = 1,
-    wxSYS_CAN_ICONIZE_FRAME
+    wxSYS_CAN_ICONIZE_FRAME,
+    wxSYS_TABLET_PRESENT 
 };
 
 
@@ -165,7 +166,7 @@ public:
     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);
@@ -199,8 +200,15 @@ public:
     static wxString GetOption(const wxString& name) ;
     static int GetOptionInt(const wxString& name) ;
     static bool HasOption(const wxString& name) ;
+    static bool IsFalse(const wxString& name);
 };
 
 
 
+%pythoncode {
+    %# Until the new native control for wxMac is up to par, still use the generic one.
+    SystemOptions.SetOptionInt("mac.listctrl.always_use_generic", 1)
+}
+
+
 //---------------------------------------------------------------------------