Apply parts of patch #1719888 to fix compilation on Mac and with

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

diff --git a/wxPython/src/_validator.i b/wxPython/src/_validator.i
index 1d36c338dec4dad714f19e6f7bb698128041549b..8d4377ab7406ca6d61ccc2bbd9bbbaaf713e6231 100644 (file)
--- a/wxPython/src/_validator.i
+++ b/wxPython/src/_validator.i
@@ -63,6 +63,7 @@ public:
     static bool IsSilent();
     static void SetBellOnError(int doIt = true);
 
     static bool IsSilent();
     static void SetBellOnError(int doIt = true);
 

+    %property(Window, GetWindow, SetWindow, doc="See `GetWindow` and `SetWindow`");

 };
 
 
 };
 
 


@@ -78,12 +79,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxPyValidator, wxValidator);
 
 class wxPyValidator : public wxValidator {
 public:
 
 class wxPyValidator : public wxValidator {
 public:

-    %pythonAppend wxPyValidator "
-        self._setCallbackInfo(self, PyValidator, 1)
-        self._setOORInfo(self)"
+    %pythonAppend wxPyValidator "self._setOORInfo(self);"  setCallbackInfo(PyValidator)
+        

     wxPyValidator();
 
     wxPyValidator();
 

-    void _setCallbackInfo(PyObject* self, PyObject* _class, int incref=true);
+    void _setCallbackInfo(PyObject* self, PyObject* _class, int incref=1);

 };
 
 
 };