X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d14a1e28567de23c586bc80017073d0c39f8d18f..9e477492e29e03c02827b1e42a16cb09a13f5149:/wxPython/src/_validator.i?ds=sidebyside

diff --git a/wxPython/src/_validator.i b/wxPython/src/_validator.i
index f04eb83383..8d4377ab74 100644
--- a/wxPython/src/_validator.i
+++ b/wxPython/src/_validator.i
@@ -32,11 +32,16 @@
 class wxValidator : public wxEvtHandler
 {
 public:
-    %addtofunc wxValidator "self._setOORInfo(self)"
+    %pythonAppend wxValidator "self._setOORInfo(self)"
+    %typemap(out) wxValidator*;    // turn off this typemap
+
     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();
 
@@ -56,8 +61,9 @@ public:
     // 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:
-    %addtofunc wxPyValidator "
-        self._setCallbackInfo(self, PyValidator, 1)
-        self._setOORInfo(self)"
+    %pythonAppend wxPyValidator "self._setOORInfo(self);"  setCallbackInfo(PyValidator)
+        
     wxPyValidator();
 
-    void _setCallbackInfo(PyObject* self, PyObject* _class, int incref=TRUE);
+    void _setCallbackInfo(PyObject* self, PyObject* _class, int incref=1);
 };
 
 
 
 %immutable;
-// See also wxPy_ReinitStockObjects in helpers.cpp
 const wxValidator wxDefaultValidator;
 %mutable;