wxUSE_STL/wxArrayString fixes.

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

diff --git a/wxPython/src/_validator.i b/wxPython/src/_validator.i
index f04eb83383de204964aba7c9efb2b83faa9356a7..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();
 
@@ -56,7 +61,7 @@ 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);
 
 };
 
@@ -73,12 +78,12 @@ 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);
 };