wxUSE_STL/wxArrayString fixes.

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

diff --git a/wxPython/src/_validator.i b/wxPython/src/_validator.i
index 10da1778a52ff7264bbe8453792aad88b254418a..e68789f9e96d02102695601b70d93465fa518f8f 100644 (file)
--- 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();
 
@@ -73,7 +78,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPyValidator, wxValidator);
 
 class wxPyValidator : public wxValidator {
 public:
-    %addtofunc wxPyValidator "
+    %pythonAppend wxPyValidator "
         self._setCallbackInfo(self, PyValidator, 1)
         self._setOORInfo(self)"
     wxPyValidator();