Squash exception on exit bug

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

diff --git a/wxPython/src/_settings.i b/wxPython/src/_settings.i
index 38720a9537716c808b1fa8eb0db52da689a5fb48..589efa1c6ac33a1fd73411171305baadccc63ea6 100644 (file)
--- a/wxPython/src/_settings.i
+++ b/wxPython/src/_settings.i
@@ -165,7 +165,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);
@@ -183,6 +183,8 @@ public:
 
 //---------------------------------------------------------------------------
 
+MAKE_CONST_WXSTRING(WINDOW_DEFAULT_VARIANT);
+
 class wxSystemOptions : public wxObject
 {
 public:
@@ -193,10 +195,11 @@ public:
     // to implement SetSystemColour/Font/Metric
 
     static void SetOption(const wxString& name, const wxString& value);
-    %name(SetOptionInt) static void SetOption(const wxString& name, int value);
+    %Rename(SetOptionInt,  static void, SetOption(const wxString& name, int value));
     static wxString GetOption(const wxString& name) ;
     static int GetOptionInt(const wxString& name) ;
     static bool HasOption(const wxString& name) ;
+    static bool IsFalse(const wxString& name);
 };