Using a new version of SWIG

A few minor fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-08-18 07:41:59 +00:00
parent 661dc384df
commit 1d99702e4b
42 changed files with 22724 additions and 19830 deletions
--- a/utils/wxPython/src/msw/misc2.cpp
+++ b/utils/wxPython/src/msw/misc2.cpp
@@ -3,7 +3,7 @@
 * 
 * This file was automatically generated by :
 * Simplified Wrapper and Interface Generator (SWIG)
- * Version 1.1 (Patch 5)
+ * Version 1.1 (Patch 6)
 * 
 * Portions Copyright (c) 1995-1998
 * The University of Utah and The Regents of the University of California.
@@ -24,16 +24,16 @@
 /* Definitions for Windows/Unix exporting */
 #if defined(__WIN32__)
 #   if defined(_MSC_VER)
-#	define SWIGEXPORT(a,b) __declspec(dllexport) a b
+#	define SWIGEXPORT(a) __declspec(dllexport) a
 #   else
 #	if defined(__BORLANDC__)
-#	    define SWIGEXPORT(a,b) a _export b
+#	    define SWIGEXPORT(a) a _export 
 #	else
-#	    define SWIGEXPORT(a,b) a b
+#	    define SWIGEXPORT(a) a 
 #	endif
 #   endif
 #else
-#   define SWIGEXPORT(a,b) a b
+#   define SWIGEXPORT(a) a 
 #endif

 #ifdef __cplusplus
@@ -43,12 +43,12 @@ extern "C" {
 extern void SWIG_MakePtr(char *, void *, char *);
 extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
 extern char *SWIG_GetPtr(char *, void **, char *);
+extern char *SWIG_GetPtrObj(PyObject *, void **, char *);
 extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
 extern PyObject *SWIG_newvarlink(void);
 #ifdef __cplusplus
 }
 #endif
-
 #define SWIG_init    initmisc2c

 #define SWIG_name    "misc2c"
@@ -59,12 +59,13 @@ extern PyObject *SWIG_newvarlink(void);

 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
    PyObject*   o2;
-    if (!target) {
+    PyObject*   o3;
+    if (!target) {                   
        target = o;
-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  
        Py_DECREF(Py_None);
        target = o;
-    } else {
+    } else {                         
        if (!PyList_Check(target)) {
            o2 = target;
            target = PyList_New(0);
@@ -81,23 +82,23 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
    PyObject*   o2;
    PyObject*   o3;

-    if (!target) {
+    if (!target) {                   
        target = o;
-    } else if (target == Py_None) {
+    } else if (target == Py_None) {  
        Py_DECREF(Py_None);
        target = o;
-    } else {
+    } else {                         
        if (!PyTuple_Check(target)) {
            o2 = target;
            target = PyTuple_New(1);
            PyTuple_SetItem(target, 0, o2);
        }
-        o3 = PyTuple_New(1);
-        PyTuple_SetItem(o3, 0, o);
+        o3 = PyTuple_New(1);            
+        PyTuple_SetItem(o3, 0, o);      

        o2 = target;
-        target = PySequence_Concat(o2, o3);
-        Py_DECREF(o2);
+        target = PySequence_Concat(o2, o3); 
+        Py_DECREF(o2);                      
        Py_DECREF(o3);
    }
    return target;
@@ -123,17 +124,20 @@ static char* wxStringErrorMsg = "string type is required for parameter";
    void wxToolTip_SetDelay(long milliseconds) {
        wxToolTip::SetDelay(milliseconds);
    }
+#ifdef __cplusplus
+extern "C" {
+#endif
 static PyObject *_wrap_wxFindWindowByLabel(PyObject *self, PyObject *args) {
    PyObject * _resultobj;
    wxWindow * _result;
    wxString * _arg0;
-    wxWindow * _arg1 = NULL;
+    wxWindow * _arg1 = (wxWindow *) NULL;
    PyObject * _obj0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo1 = 0;
    char _ptemp[128];

    self = self;
-    if(!PyArg_ParseTuple(args,"O|s:wxFindWindowByLabel",&_obj0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"O|O:wxFindWindowByLabel",&_obj0,&_argo1)) 
        return NULL;
 {
    if (!PyString_Check(_obj0)) {
@@ -142,8 +146,9 @@ static PyObject *_wrap_wxFindWindowByLabel(PyObject *self, PyObject *args) {
    }
    _arg0 = new wxString(PyString_AsString(_obj0), PyString_Size(_obj0));
 }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {
            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFindWindowByLabel. Expected _wxWindow_p.");
        return NULL;
        }
@@ -153,8 +158,13 @@ static PyObject *_wrap_wxFindWindowByLabel(PyObject *self, PyObject *args) {
        _result = (wxWindow *)wxFindWindowByLabel(*_arg0,_arg1);

    wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
 {
    if (_obj0)
        delete _arg0;
@@ -166,13 +176,13 @@ static PyObject *_wrap_wxFindWindowByName(PyObject *self, PyObject *args) {
    PyObject * _resultobj;
    wxWindow * _result;
    wxString * _arg0;
-    wxWindow * _arg1 = NULL;
+    wxWindow * _arg1 = (wxWindow *) NULL;
    PyObject * _obj0 = 0;
-    char * _argc1 = 0;
+    PyObject * _argo1 = 0;
    char _ptemp[128];

    self = self;
-    if(!PyArg_ParseTuple(args,"O|s:wxFindWindowByName",&_obj0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"O|O:wxFindWindowByName",&_obj0,&_argo1)) 
        return NULL;
 {
    if (!PyString_Check(_obj0)) {
@@ -181,8 +191,9 @@ static PyObject *_wrap_wxFindWindowByName(PyObject *self, PyObject *args) {
    }
    _arg0 = new wxString(PyString_AsString(_obj0), PyString_Size(_obj0));
 }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {
            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFindWindowByName. Expected _wxWindow_p.");
        return NULL;
        }
@@ -192,8 +203,13 @@ static PyObject *_wrap_wxFindWindowByName(PyObject *self, PyObject *args) {
        _result = (wxWindow *)wxFindWindowByName(*_arg0,_arg1);

    wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
 {
    if (_obj0)
        delete _arg0;
@@ -260,8 +276,13 @@ static PyObject *_wrap_new_wxToolTip(PyObject *self, PyObject *args) {
        _result = (wxToolTip *)new_wxToolTip(*_arg0);

    wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolTip_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolTip_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
 {
    if (_obj0)
        delete _arg0;
@@ -274,14 +295,15 @@ static PyObject *_wrap_wxToolTip_SetTip(PyObject *self, PyObject *args) {
    PyObject * _resultobj;
    wxToolTip * _arg0;
    wxString * _arg1;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
    PyObject * _obj1 = 0;

    self = self;
-    if(!PyArg_ParseTuple(args,"sO:wxToolTip_SetTip",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"OO:wxToolTip_SetTip",&_argo0,&_obj1)) 
        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolTip_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolTip_p")) {
            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolTip_SetTip. Expected _wxToolTip_p.");
        return NULL;
        }
@@ -312,13 +334,14 @@ static PyObject *_wrap_wxToolTip_GetTip(PyObject *self, PyObject *args) {
    PyObject * _resultobj;
    wxString * _result;
    wxToolTip * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;

    self = self;
-    if(!PyArg_ParseTuple(args,"s:wxToolTip_GetTip",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxToolTip_GetTip",&_argo0)) 
        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolTip_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolTip_p")) {
            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolTip_GetTip. Expected _wxToolTip_p.");
        return NULL;
        }
@@ -342,14 +365,15 @@ static PyObject *_wrap_wxToolTip_GetWindow(PyObject *self, PyObject *args) {
    PyObject * _resultobj;
    wxWindow * _result;
    wxToolTip * _arg0;
-    char * _argc0 = 0;
+    PyObject * _argo0 = 0;
    char _ptemp[128];

    self = self;
-    if(!PyArg_ParseTuple(args,"s:wxToolTip_GetWindow",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"O:wxToolTip_GetWindow",&_argo0)) 
        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolTip_p")) {
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolTip_p")) {
            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolTip_GetWindow. Expected _wxToolTip_p.");
        return NULL;
        }
@@ -359,173 +383,188 @@ static PyObject *_wrap_wxToolTip_GetWindow(PyObject *self, PyObject *args) {
        _result = (wxWindow *)wxToolTip_GetWindow(_arg0);

    wxPy_END_ALLOW_THREADS;
-}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
    return _resultobj;
 }

 static PyMethodDef misc2cMethods[] = {
-	 { "wxToolTip_GetWindow", _wrap_wxToolTip_GetWindow, 1 },
-	 { "wxToolTip_GetTip", _wrap_wxToolTip_GetTip, 1 },
-	 { "wxToolTip_SetTip", _wrap_wxToolTip_SetTip, 1 },
-	 { "new_wxToolTip", _wrap_new_wxToolTip, 1 },
-	 { "wxToolTip_SetDelay", _wrap_wxToolTip_SetDelay, 1 },
-	 { "wxToolTip_Enable", _wrap_wxToolTip_Enable, 1 },
-	 { "wxFindWindowByName", _wrap_wxFindWindowByName, 1 },
-	 { "wxFindWindowByLabel", _wrap_wxFindWindowByLabel, 1 },
+	 { "wxToolTip_GetWindow", _wrap_wxToolTip_GetWindow, METH_VARARGS },
+	 { "wxToolTip_GetTip", _wrap_wxToolTip_GetTip, METH_VARARGS },
+	 { "wxToolTip_SetTip", _wrap_wxToolTip_SetTip, METH_VARARGS },
+	 { "new_wxToolTip", _wrap_new_wxToolTip, METH_VARARGS },
+	 { "wxToolTip_SetDelay", _wrap_wxToolTip_SetDelay, METH_VARARGS },
+	 { "wxToolTip_Enable", _wrap_wxToolTip_Enable, METH_VARARGS },
+	 { "wxFindWindowByName", _wrap_wxFindWindowByName, METH_VARARGS },
+	 { "wxFindWindowByLabel", _wrap_wxFindWindowByLabel, METH_VARARGS },
 	 { NULL, NULL }
 };
+#ifdef __cplusplus
+}
+#endif
+/*
+ * This table is used by the pointer type-checker
+ */
+static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
+    { "_wxAcceleratorTable","_class_wxAcceleratorTable",0},
+    { "_signed_long","_long",0},
+    { "_wxPrintQuality","_int",0},
+    { "_wxPrintQuality","_signed_int",0},
+    { "_wxPrintQuality","_unsigned_int",0},
+    { "_wxPrintQuality","_wxWindowID",0},
+    { "_wxPrintQuality","_uint",0},
+    { "_wxPrintQuality","_EBool",0},
+    { "_wxPrintQuality","_size_t",0},
+    { "_class_wxRegionIterator","_wxRegionIterator",0},
+    { "_class_wxMenuBar","_wxMenuBar",0},
+    { "_class_wxEvtHandler","_wxEvtHandler",0},
+    { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
+    { "_wxCursor","_class_wxCursor",0},
+    { "_wxMask","_class_wxMask",0},
+    { "_wxToolTip","_class_wxToolTip",0},
+    { "_wxPen","_class_wxPen",0},
+    { "_byte","_unsigned_char",0},
+    { "_long","_wxDash",0},
+    { "_long","_unsigned_long",0},
+    { "_long","_signed_long",0},
+    { "_wxImageList","_class_wxImageList",0},
+    { "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
+    { "_wxDC","_class_wxDC",0},
+    { "_size_t","_wxPrintQuality",0},
+    { "_size_t","_unsigned_int",0},
+    { "_size_t","_int",0},
+    { "_size_t","_wxWindowID",0},
+    { "_size_t","_uint",0},
+    { "_class_wxRealPoint","_wxRealPoint",0},
+    { "_wxPrinterDC","_class_wxPrinterDC",0},
+    { "_class_wxMenuItem","_wxMenuItem",0},
+    { "_wxPanel","_class_wxPanel",0},
+    { "_class_wxMask","_wxMask",0},
+    { "_class_wxToolTip","_wxToolTip",0},
+    { "_wxColour","_class_wxColour",0},
+    { "_class_wxDialog","_wxDialog",0},
+    { "_wxBrush","_class_wxBrush",0},
+    { "_uint","_wxPrintQuality",0},
+    { "_uint","_size_t",0},
+    { "_uint","_unsigned_int",0},
+    { "_uint","_int",0},
+    { "_uint","_wxWindowID",0},
+    { "_wxRect","_class_wxRect",0},
+    { "_wxPoint","_class_wxPoint",0},
+    { "_wxBitmap","_class_wxBitmap",0},
+    { "_wxPyTimer","_class_wxPyTimer",0},
+    { "_wxWindowDC","_class_wxWindowDC",0},
+    { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
+    { "_EBool","_wxPrintQuality",0},
+    { "_EBool","_signed_int",0},
+    { "_EBool","_int",0},
+    { "_EBool","_wxWindowID",0},
+    { "_class_wxRegion","_wxRegion",0},
+    { "_wxFont","_class_wxFont",0},
+    { "_unsigned_long","_wxDash",0},
+    { "_unsigned_long","_long",0},
+    { "_class_wxRect","_wxRect",0},
+    { "_class_wxDC","_wxDC",0},
+    { "_class_wxPyTimer","_wxPyTimer",0},
+    { "_wxAcceleratorEntry","_class_wxAcceleratorEntry",0},
+    { "_class_wxPanel","_wxPanel",0},
+    { "_signed_int","_wxPrintQuality",0},
+    { "_signed_int","_EBool",0},
+    { "_signed_int","_wxWindowID",0},
+    { "_signed_int","_int",0},
+    { "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
+    { "_wxMetaFileDC","_class_wxMetaFileDC",0},
+    { "_wxMenu","_class_wxMenu",0},
+    { "_wxScreenDC","_class_wxScreenDC",0},
+    { "_WXTYPE","_short",0},
+    { "_WXTYPE","_signed_short",0},
+    { "_WXTYPE","_unsigned_short",0},
+    { "_class_wxBrush","_wxBrush",0},
+    { "_unsigned_short","_WXTYPE",0},
+    { "_unsigned_short","_short",0},
+    { "_class_wxWindow","_wxWindow",0},
+    { "_class_wxFont","_wxFont",0},
+    { "_wxClientDC","_class_wxClientDC",0},
+    { "_class_wxPoint","_wxPoint",0},
+    { "_wxRealPoint","_class_wxRealPoint",0},
+    { "_signed_short","_WXTYPE",0},
+    { "_signed_short","_short",0},
+    { "_wxMemoryDC","_class_wxMemoryDC",0},
+    { "_wxPaintDC","_class_wxPaintDC",0},
+    { "_class_wxWindowDC","_wxWindowDC",0},
+    { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
+    { "_class_wxCursor","_wxCursor",0},
+    { "_wxScrolledWindow","_class_wxScrolledWindow",0},
+    { "_unsigned_char","_byte",0},
+    { "_class_wxMetaFileDC","_wxMetaFileDC",0},
+    { "_class_wxMenu","_wxMenu",0},
+    { "_unsigned_int","_wxPrintQuality",0},
+    { "_unsigned_int","_size_t",0},
+    { "_unsigned_int","_uint",0},
+    { "_unsigned_int","_wxWindowID",0},
+    { "_unsigned_int","_int",0},
+    { "_wxIcon","_class_wxIcon",0},
+    { "_wxDialog","_class_wxDialog",0},
+    { "_class_wxPen","_wxPen",0},
+    { "_short","_WXTYPE",0},
+    { "_short","_unsigned_short",0},
+    { "_short","_signed_short",0},
+    { "_class_wxImageList","_wxImageList",0},
+    { "_wxWindowID","_wxPrintQuality",0},
+    { "_wxWindowID","_size_t",0},
+    { "_wxWindowID","_EBool",0},
+    { "_wxWindowID","_uint",0},
+    { "_wxWindowID","_int",0},
+    { "_wxWindowID","_signed_int",0},
+    { "_wxWindowID","_unsigned_int",0},
+    { "_int","_wxPrintQuality",0},
+    { "_int","_size_t",0},
+    { "_int","_EBool",0},
+    { "_int","_uint",0},
+    { "_int","_wxWindowID",0},
+    { "_int","_unsigned_int",0},
+    { "_int","_signed_int",0},
+    { "_wxSize","_class_wxSize",0},
+    { "_wxRegionIterator","_class_wxRegionIterator",0},
+    { "_class_wxPrinterDC","_wxPrinterDC",0},
+    { "_class_wxPaintDC","_wxPaintDC",0},
+    { "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
+    { "_class_wxIcon","_wxIcon",0},
+    { "_class_wxColour","_wxColour",0},
+    { "_class_wxScreenDC","_wxScreenDC",0},
+    { "_wxPalette","_class_wxPalette",0},
+    { "_wxRegion","_class_wxRegion",0},
+    { "_class_wxClientDC","_wxClientDC",0},
+    { "_class_wxSize","_wxSize",0},
+    { "_class_wxBitmap","_wxBitmap",0},
+    { "_class_wxMemoryDC","_wxMemoryDC",0},
+    { "_wxMenuBar","_class_wxMenuBar",0},
+    { "_wxEvtHandler","_class_wxEvtHandler",0},
+    { "_wxMenuItem","_class_wxMenuItem",0},
+    { "_wxDash","_unsigned_long",0},
+    { "_wxDash","_long",0},
+    { "_class_wxScrolledWindow","_wxScrolledWindow",0},
+    { "_class_wxPalette","_wxPalette",0},
+    { "_wxWindow","_class_wxWindow",0},
+{0,0,0}};
+
 static PyObject *SWIG_globals;
 #ifdef __cplusplus
 extern "C" 
 #endif
-SWIGEXPORT(void,initmisc2c)() {
+SWIGEXPORT(void) initmisc2c() {
 	 PyObject *m, *d;
 	 SWIG_globals = SWIG_newvarlink();
 	 m = Py_InitModule("misc2c", misc2cMethods);
 	 d = PyModule_GetDict(m);
-/*
- * These are the pointer type-equivalency mappings. 
- * (Used by the SWIG pointer type-checker).
- */
-	 SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0);
-	 SWIG_RegisterMapping("_signed_long","_long",0);
-	 SWIG_RegisterMapping("_wxPrintQuality","_int",0);
-	 SWIG_RegisterMapping("_wxPrintQuality","_signed_int",0);
-	 SWIG_RegisterMapping("_wxPrintQuality","_unsigned_int",0);
-	 SWIG_RegisterMapping("_wxPrintQuality","_wxWindowID",0);
-	 SWIG_RegisterMapping("_wxPrintQuality","_uint",0);
-	 SWIG_RegisterMapping("_wxPrintQuality","_EBool",0);
-	 SWIG_RegisterMapping("_wxPrintQuality","_size_t",0);
-	 SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
-	 SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
-	 SWIG_RegisterMapping("_class_wxEvtHandler","_wxEvtHandler",0);
-	 SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
-	 SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
-	 SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
-	 SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0);
-	 SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
-	 SWIG_RegisterMapping("_byte","_unsigned_char",0);
-	 SWIG_RegisterMapping("_long","_wxDash",0);
-	 SWIG_RegisterMapping("_long","_unsigned_long",0);
-	 SWIG_RegisterMapping("_long","_signed_long",0);
-	 SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0);
-	 SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
-	 SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
-	 SWIG_RegisterMapping("_size_t","_wxPrintQuality",0);
-	 SWIG_RegisterMapping("_size_t","_unsigned_int",0);
-	 SWIG_RegisterMapping("_size_t","_int",0);
-	 SWIG_RegisterMapping("_size_t","_wxWindowID",0);
-	 SWIG_RegisterMapping("_size_t","_uint",0);
-	 SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
-	 SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0);
-	 SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0);
-	 SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);
-	 SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
-	 SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0);
-	 SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
-	 SWIG_RegisterMapping("_class_wxDialog","_wxDialog",0);
-	 SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
-	 SWIG_RegisterMapping("_uint","_wxPrintQuality",0);
-	 SWIG_RegisterMapping("_uint","_size_t",0);
-	 SWIG_RegisterMapping("_uint","_unsigned_int",0);
-	 SWIG_RegisterMapping("_uint","_int",0);
-	 SWIG_RegisterMapping("_uint","_wxWindowID",0);
-	 SWIG_RegisterMapping("_wxRect","_class_wxRect",0);
-	 SWIG_RegisterMapping("_wxPoint","_class_wxPoint",0);
-	 SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
-	 SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
-	 SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0);
-	 SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
-	 SWIG_RegisterMapping("_EBool","_wxPrintQuality",0);
-	 SWIG_RegisterMapping("_EBool","_signed_int",0);
-	 SWIG_RegisterMapping("_EBool","_int",0);
-	 SWIG_RegisterMapping("_EBool","_wxWindowID",0);
-	 SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
-	 SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
-	 SWIG_RegisterMapping("_unsigned_long","_wxDash",0);
-	 SWIG_RegisterMapping("_unsigned_long","_long",0);
-	 SWIG_RegisterMapping("_class_wxRect","_wxRect",0);
-	 SWIG_RegisterMapping("_class_wxDC","_wxDC",0);
-	 SWIG_RegisterMapping("_class_wxPyTimer","_wxPyTimer",0);
-	 SWIG_RegisterMapping("_wxAcceleratorEntry","_class_wxAcceleratorEntry",0);
-	 SWIG_RegisterMapping("_class_wxPanel","_wxPanel",0);
-	 SWIG_RegisterMapping("_signed_int","_wxPrintQuality",0);
-	 SWIG_RegisterMapping("_signed_int","_EBool",0);
-	 SWIG_RegisterMapping("_signed_int","_wxWindowID",0);
-	 SWIG_RegisterMapping("_signed_int","_int",0);
-	 SWIG_RegisterMapping("_wxLayoutConstraints","_class_wxLayoutConstraints",0);
-	 SWIG_RegisterMapping("_wxMetaFileDC","_class_wxMetaFileDC",0);
-	 SWIG_RegisterMapping("_wxMenu","_class_wxMenu",0);
-	 SWIG_RegisterMapping("_wxScreenDC","_class_wxScreenDC",0);
-	 SWIG_RegisterMapping("_WXTYPE","_short",0);
-	 SWIG_RegisterMapping("_WXTYPE","_signed_short",0);
-	 SWIG_RegisterMapping("_WXTYPE","_unsigned_short",0);
-	 SWIG_RegisterMapping("_class_wxBrush","_wxBrush",0);
-	 SWIG_RegisterMapping("_unsigned_short","_WXTYPE",0);
-	 SWIG_RegisterMapping("_unsigned_short","_short",0);
-	 SWIG_RegisterMapping("_class_wxWindow","_wxWindow",0);
-	 SWIG_RegisterMapping("_class_wxFont","_wxFont",0);
-	 SWIG_RegisterMapping("_wxClientDC","_class_wxClientDC",0);
-	 SWIG_RegisterMapping("_class_wxPoint","_wxPoint",0);
-	 SWIG_RegisterMapping("_wxRealPoint","_class_wxRealPoint",0);
-	 SWIG_RegisterMapping("_signed_short","_WXTYPE",0);
-	 SWIG_RegisterMapping("_signed_short","_short",0);
-	 SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0);
-	 SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
-	 SWIG_RegisterMapping("_class_wxWindowDC","_wxWindowDC",0);
-	 SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
-	 SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);
-	 SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0);
-	 SWIG_RegisterMapping("_unsigned_char","_byte",0);
-	 SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0);
-	 SWIG_RegisterMapping("_class_wxMenu","_wxMenu",0);
-	 SWIG_RegisterMapping("_unsigned_int","_wxPrintQuality",0);
-	 SWIG_RegisterMapping("_unsigned_int","_size_t",0);
-	 SWIG_RegisterMapping("_unsigned_int","_uint",0);
-	 SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0);
-	 SWIG_RegisterMapping("_unsigned_int","_int",0);
-	 SWIG_RegisterMapping("_wxIcon","_class_wxIcon",0);
-	 SWIG_RegisterMapping("_wxDialog","_class_wxDialog",0);
-	 SWIG_RegisterMapping("_class_wxPen","_wxPen",0);
-	 SWIG_RegisterMapping("_short","_WXTYPE",0);
-	 SWIG_RegisterMapping("_short","_unsigned_short",0);
-	 SWIG_RegisterMapping("_short","_signed_short",0);
-	 SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0);
-	 SWIG_RegisterMapping("_wxWindowID","_wxPrintQuality",0);
-	 SWIG_RegisterMapping("_wxWindowID","_size_t",0);
-	 SWIG_RegisterMapping("_wxWindowID","_EBool",0);
-	 SWIG_RegisterMapping("_wxWindowID","_uint",0);
-	 SWIG_RegisterMapping("_wxWindowID","_int",0);
-	 SWIG_RegisterMapping("_wxWindowID","_signed_int",0);
-	 SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0);
-	 SWIG_RegisterMapping("_int","_wxPrintQuality",0);
-	 SWIG_RegisterMapping("_int","_size_t",0);
-	 SWIG_RegisterMapping("_int","_EBool",0);
-	 SWIG_RegisterMapping("_int","_uint",0);
-	 SWIG_RegisterMapping("_int","_wxWindowID",0);
-	 SWIG_RegisterMapping("_int","_unsigned_int",0);
-	 SWIG_RegisterMapping("_int","_signed_int",0);
-	 SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
-	 SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
-	 SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0);
-	 SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
-	 SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
-	 SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
-	 SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
-	 SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
-	 SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
-	 SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
-	 SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
-	 SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
-	 SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0);
-	 SWIG_RegisterMapping("_class_wxMemoryDC","_wxMemoryDC",0);
-	 SWIG_RegisterMapping("_wxMenuBar","_class_wxMenuBar",0);
-	 SWIG_RegisterMapping("_wxEvtHandler","_class_wxEvtHandler",0);
-	 SWIG_RegisterMapping("_wxMenuItem","_class_wxMenuItem",0);
-	 SWIG_RegisterMapping("_wxDash","_unsigned_long",0);
-	 SWIG_RegisterMapping("_wxDash","_long",0);
-	 SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
-	 SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);
-	 SWIG_RegisterMapping("_wxWindow","_class_wxWindow",0);
+{
+   int i;
+   for (i = 0; _swig_mapping[i].n1; i++)
+        SWIG_RegisterMapping(_swig_mapping[i].n1,_swig_mapping[i].n2,_swig_mapping[i].pcnv);
+}
 }