Detect Apple bug that prevents the joystick code compiling for OS X 10.1

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

diff --git a/wxPython/src/_settings.i b/wxPython/src/_settings.i
index b4bc618260cb6060abcd62ab7357f9281908caa6..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 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);


@@ -199,6 +199,7 @@ public:
     static wxString GetOption(const wxString& name) ;
     static int GetOptionInt(const wxString& name) ;
     static bool HasOption(const wxString& name) ;
     static wxString GetOption(const wxString& name) ;
     static int GetOptionInt(const wxString& name) ;
     static bool HasOption(const wxString& name) ;

+    static bool IsFalse(const wxString& name);

 };
 
 
 };