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 f04eb83383de204964aba7c9efb2b83faa9356a7..8d4377ab7406ca6d61ccc2bbd9bbbaaf713e6231 100644 (file)
--- a/wxPython/src/_validator.i
+++ b/wxPython/src/_validator.i
@@ -32,11 +32,16 @@
 class wxValidator : public wxEvtHandler
 {
 public:
 class wxValidator : public wxEvtHandler
 {
 public:

-    %addtofunc wxValidator "self._setOORInfo(self)"
+    %pythonAppend wxValidator "self._setOORInfo(self)"
+    %typemap(out) wxValidator*;    // turn off this typemap
+

     wxValidator();
     //~wxValidator();
 
     wxValidator();
     //~wxValidator();
 

+    // Turn it back on again
+    %typemap(out) wxValidator* { $result = wxPyMake_wxObject($1, $owner); }

 
 

+    

     // Make a clone of this validator (or return NULL)
     wxValidator* Clone();
 
     // Make a clone of this validator (or return NULL)
     wxValidator* Clone();
 


@@ -56,8 +61,9 @@ public:
     // validators beep by default if invalid key is pressed, these functions
     // allow to change it
     static bool IsSilent();
     // validators beep by default if invalid key is pressed, these functions
     // allow to change it
     static bool IsSilent();

-    static void SetBellOnError(int doIt = TRUE);
+    static void SetBellOnError(int doIt = true);

 
 

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

 };
 
 
 };
 
 


@@ -73,18 +79,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxPyValidator, wxValidator);
 
 class wxPyValidator : public wxValidator {
 public:
 
 class wxPyValidator : public wxValidator {
 public:

-    %addtofunc 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);

 };
 
 
 
 %immutable;
 };
 
 
 
 %immutable;

-// See also wxPy_ReinitStockObjects in helpers.cpp

 const wxValidator wxDefaultValidator;
 %mutable;
 
 const wxValidator wxDefaultValidator;
 %mutable;