X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd9f7fea29e3f8bb61861f52984b7943512346ac..5f2502393e042e6e2c871ff94b7ccaf7a78b264d:/wxPython/src/_validator.i diff --git a/wxPython/src/_validator.i b/wxPython/src/_validator.i index 10da1778a5..4c72e8b05a 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,17 @@ IMPLEMENT_DYNAMIC_CLASS(wxPyValidator, wxValidator); class wxPyValidator : public wxValidator { public: - %addtofunc wxPyValidator " + %pythonAppend wxPyValidator " self._setCallbackInfo(self, PyValidator, 1) self._setOORInfo(self)" wxPyValidator(); - void _setCallbackInfo(PyObject* self, PyObject* _class, int incref=True); + void _setCallbackInfo(PyObject* self, PyObject* _class, int incref=true); }; %immutable; -// See also wxPy_ReinitStockObjects in helpers.cpp const wxValidator wxDefaultValidator; %mutable;