wxPython 2.1b1: Very minor changes needed for wxGTK

[wxWidgets.git] / utils / wxPython / src / msw / stattool.cpp

diff --git a/utils/wxPython/src/msw/stattool.cpp b/utils/wxPython/src/msw/stattool.cpp
index 57447f67f1b8b3fe18376c43ee7fc9dca851eb24..32620e976137e18c5c8e2be490fce2c21b9c5427 100644 (file)
--- a/utils/wxPython/src/msw/stattool.cpp
+++ b/utils/wxPython/src/msw/stattool.cpp
@@ -104,15 +104,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
 }
 
 
 }
 
 

+extern byte* byte_LIST_helper(PyObject* source);

 extern int* int_LIST_helper(PyObject* source);
 extern long* long_LIST_helper(PyObject* source);
 extern char** string_LIST_helper(PyObject* source);
 extern wxPoint* wxPoint_LIST_helper(PyObject* source);
 extern wxBitmap** wxBitmap_LIST_helper(PyObject* source);
 extern wxString* wxString_LIST_helper(PyObject* source);
 extern int* int_LIST_helper(PyObject* source);
 extern long* long_LIST_helper(PyObject* source);
 extern char** string_LIST_helper(PyObject* source);
 extern wxPoint* wxPoint_LIST_helper(PyObject* source);
 extern wxBitmap** wxBitmap_LIST_helper(PyObject* source);
 extern wxString* wxString_LIST_helper(PyObject* source);

-#ifdef __WXMSW__

 extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
 extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);

-#endif

 
 
 static char* wxStringErrorMsg = "string type is required for parameter";
 
 
 static char* wxStringErrorMsg = "string type is required for parameter";


@@ -140,7 +139,7 @@ static PyObject *_wrap_new_wxStatusBar(PyObject *self, PyObject *args) {
     wxWindowID  _arg1;
     wxPoint * _arg2 = &wxPyDefaultPosition;
     wxSize * _arg3 = &wxPyDefaultSize;
     wxWindowID  _arg1;
     wxPoint * _arg2 = &wxPyDefaultPosition;
     wxSize * _arg3 = &wxPyDefaultSize;

-    long  _arg4 = wxST_SIZEGRIP;
+    long  _arg4 = (wxST_SIZEGRIP);

     char * _arg5 = "statusBar";
     char * _argc0 = 0;
     char * _argc2 = 0;
     char * _arg5 = "statusBar";
     char * _argc0 = 0;
     char * _argc2 = 0;


@@ -168,8 +167,12 @@ static PyObject *_wrap_new_wxStatusBar(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (wxStatusBar *)new_wxStatusBar(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxStatusBar_p");
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxStatusBar *)new_wxStatusBar(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxStatusBar_p");

     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }


@@ -196,8 +199,12 @@ static PyObject *_wrap_wxStatusBar_GetFieldRect(PyObject *self, PyObject *args)
         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (wxRect *)wxStatusBar_GetFieldRect(_arg0,_arg1);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxRect_p");
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxRect *)wxStatusBar_GetFieldRect(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxRect_p");

     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }


@@ -218,8 +225,12 @@ static PyObject *_wrap_wxStatusBar_GetFieldsCount(PyObject *self, PyObject *args
         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (int )wxStatusBar_GetFieldsCount(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (int )wxStatusBar_GetFieldsCount(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -240,8 +251,12 @@ static PyObject *_wrap_wxStatusBar_GetStatusText(PyObject *self, PyObject *args)
         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = new wxString (wxStatusBar_GetStatusText(_arg0,_arg1));

 {
 {

+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxString (wxStatusBar_GetStatusText(_arg0,_arg1));
+
+    wxPy_END_ALLOW_THREADS;
+}{

     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
 {
     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
 {


@@ -274,8 +289,12 @@ static PyObject *_wrap_wxStatusBar_DrawField(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
         return NULL;
         }
     }

-    wxStatusBar_DrawField(_arg0,*_arg1,_arg2);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxStatusBar_DrawField(_arg0,*_arg1,_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
     _resultobj = Py_None;
     return _resultobj;
 }


@@ -304,8 +323,12 @@ static PyObject *_wrap_wxStatusBar_DrawFieldText(PyObject *self, PyObject *args)
         return NULL;
         }
     }
         return NULL;
         }
     }

-    wxStatusBar_DrawFieldText(_arg0,*_arg1,_arg2);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxStatusBar_DrawFieldText(_arg0,*_arg1,_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
     _resultobj = Py_None;
     return _resultobj;
 }


@@ -325,8 +348,12 @@ static PyObject *_wrap_wxStatusBar_InitColours(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
         return NULL;
         }
     }

-    wxStatusBar_InitColours(_arg0);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxStatusBar_InitColours(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
     _resultobj = Py_None;
     return _resultobj;
 }


@@ -347,8 +374,12 @@ static PyObject *_wrap_wxStatusBar_SetFieldsCount(PyObject *self, PyObject *args
         return NULL;
         }
     }
         return NULL;
         }
     }

-    wxStatusBar_SetFieldsCount(_arg0,_arg1);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxStatusBar_SetFieldsCount(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
     _resultobj = Py_None;
     return _resultobj;
 }


@@ -376,10 +407,14 @@ static PyObject *_wrap_wxStatusBar_SetStatusText(PyObject *self, PyObject *args)
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }

-    _arg1 = new wxString(PyString_AsString(_obj1));
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));

 }
 }

-    wxStatusBar_SetStatusText(_arg0,*_arg1,_arg2);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxStatusBar_SetStatusText(_arg0,*_arg1,_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
 {
     if (_obj1)
     _resultobj = Py_None;
 {
     if (_obj1)


@@ -414,10 +449,19 @@ static PyObject *_wrap_wxStatusBar_SetStatusWidths(PyObject *self, PyObject *arg
     }
 }
 {
     }
 }
 {

-    _arg1 = PyList_Size(_obj2);
+    if (_obj2) {
+        _arg1 = PyList_Size(_obj2);
+    }
+    else {
+        _arg1 = 0;
+    }

 }
 }

-    wxStatusBar_SetStatusWidths(_arg0,_arg1,_arg2);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxStatusBar_SetStatusWidths(_arg0,_arg1,_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
 {
     delete [] _arg2;
     _resultobj = Py_None;
 {
     delete [] _arg2;


@@ -434,8 +478,12 @@ static PyObject *_wrap_new_wxToolBarTool(PyObject *self, PyObject *args) {
     self = self;
     if(!PyArg_ParseTuple(args,":new_wxToolBarTool")) 
         return NULL;
     self = self;
     if(!PyArg_ParseTuple(args,":new_wxToolBarTool")) 
         return NULL;

-    _result = (wxToolBarTool *)new_wxToolBarTool();
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarTool_p");
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxToolBarTool *)new_wxToolBarTool();
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarTool_p");

     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }


@@ -455,8 +503,12 @@ static PyObject *_wrap_delete_wxToolBarTool(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
         return NULL;
         }
     }

-    delete_wxToolBarTool(_arg0);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        delete_wxToolBarTool(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
     _resultobj = Py_None;
     return _resultobj;
 }


@@ -478,8 +530,12 @@ static PyObject *_wrap_wxToolBarTool_SetSize(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
         return NULL;
         }
     }

-    wxToolBarTool_SetSize(_arg0,_arg1,_arg2);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxToolBarTool_SetSize(_arg0,_arg1,_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
     _resultobj = Py_None;
     return _resultobj;
 }


@@ -500,8 +556,12 @@ static PyObject *_wrap_wxToolBarTool_GetWidth(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (long )wxToolBarTool_GetWidth(_arg0);
-    _resultobj = Py_BuildValue("l",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (long )wxToolBarTool_GetWidth(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("l",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -521,8 +581,38 @@ static PyObject *_wrap_wxToolBarTool_GetHeight(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (long )wxToolBarTool_GetHeight(_arg0);
-    _resultobj = Py_BuildValue("l",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (long )wxToolBarTool_GetHeight(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("l",_result);
+    return _resultobj;
+}
+
+#define wxToolBarTool_m_toolStyle_set(_swigobj,_swigval) (_swigobj->m_toolStyle = _swigval,_swigval)
+static PyObject *_wrap_wxToolBarTool_m_toolStyle_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    int  _result;
+    wxToolBarTool * _arg0;
+    int  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si:wxToolBarTool_m_toolStyle_set",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_toolStyle_set. Expected _wxToolBarTool_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (int )wxToolBarTool_m_toolStyle_set(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -542,8 +632,47 @@ static PyObject *_wrap_wxToolBarTool_m_toolStyle_get(PyObject *self, PyObject *a
         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (int )wxToolBarTool_m_toolStyle_get(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (int )wxToolBarTool_m_toolStyle_get(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxToolBarTool_m_clientData_set(_swigobj,_swigval) (_swigobj->m_clientData = _swigval,_swigval)
+static PyObject *_wrap_wxToolBarTool_m_clientData_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxObject * _result;
+    wxToolBarTool * _arg0;
+    wxObject * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxToolBarTool_m_clientData_set",&_argc0,&_argc1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_clientData_set. Expected _wxToolBarTool_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxObject_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBarTool_m_clientData_set. Expected _wxObject_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxObject *)wxToolBarTool_m_clientData_set(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxObject_p");
+    _resultobj = Py_BuildValue("s",_ptemp);

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -564,12 +693,42 @@ static PyObject *_wrap_wxToolBarTool_m_clientData_get(PyObject *self, PyObject *
         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (wxObject *)wxToolBarTool_m_clientData_get(_arg0);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxObject_p");
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxObject *)wxToolBarTool_m_clientData_get(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxObject_p");

     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
 
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
 

+#define wxToolBarTool_m_index_set(_swigobj,_swigval) (_swigobj->m_index = _swigval,_swigval)
+static PyObject *_wrap_wxToolBarTool_m_index_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    int  _result;
+    wxToolBarTool * _arg0;
+    int  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si:wxToolBarTool_m_index_set",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_index_set. Expected _wxToolBarTool_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (int )wxToolBarTool_m_index_set(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+

 #define wxToolBarTool_m_index_get(_swigobj) ((int ) _swigobj->m_index)
 static PyObject *_wrap_wxToolBarTool_m_index_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxToolBarTool_m_index_get(_swigobj) ((int ) _swigobj->m_index)
 static PyObject *_wrap_wxToolBarTool_m_index_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -586,8 +745,38 @@ static PyObject *_wrap_wxToolBarTool_m_index_get(PyObject *self, PyObject *args)
         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (int )wxToolBarTool_m_index_get(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (int )wxToolBarTool_m_index_get(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxToolBarTool_m_x_set(_swigobj,_swigval) (_swigobj->m_x = _swigval,_swigval)
+static PyObject *_wrap_wxToolBarTool_m_x_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    long  _result;
+    wxToolBarTool * _arg0;
+    long  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sl:wxToolBarTool_m_x_set",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_x_set. Expected _wxToolBarTool_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (long )wxToolBarTool_m_x_set(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("l",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -607,8 +796,38 @@ static PyObject *_wrap_wxToolBarTool_m_x_get(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (long )wxToolBarTool_m_x_get(_arg0);
-    _resultobj = Py_BuildValue("l",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (long )wxToolBarTool_m_x_get(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("l",_result);
+    return _resultobj;
+}
+
+#define wxToolBarTool_m_y_set(_swigobj,_swigval) (_swigobj->m_y = _swigval,_swigval)
+static PyObject *_wrap_wxToolBarTool_m_y_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    long  _result;
+    wxToolBarTool * _arg0;
+    long  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sl:wxToolBarTool_m_y_set",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_y_set. Expected _wxToolBarTool_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (long )wxToolBarTool_m_y_set(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("l",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -628,8 +847,38 @@ static PyObject *_wrap_wxToolBarTool_m_y_get(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (long )wxToolBarTool_m_y_get(_arg0);
-    _resultobj = Py_BuildValue("l",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (long )wxToolBarTool_m_y_get(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("l",_result);
+    return _resultobj;
+}
+
+#define wxToolBarTool_m_width_set(_swigobj,_swigval) (_swigobj->m_width = _swigval,_swigval)
+static PyObject *_wrap_wxToolBarTool_m_width_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    long  _result;
+    wxToolBarTool * _arg0;
+    long  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sl:wxToolBarTool_m_width_set",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_width_set. Expected _wxToolBarTool_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (long )wxToolBarTool_m_width_set(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("l",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 


@@ -649,509 +898,1052 @@ static PyObject *_wrap_wxToolBarTool_m_width_get(PyObject *self, PyObject *args)
         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (long )wxToolBarTool_m_width_get(_arg0);
-    _resultobj = Py_BuildValue("l",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (long )wxToolBarTool_m_width_get(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("l",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxToolBarTool_m_height_get(_swigobj) ((long ) _swigobj->m_height)
-static PyObject *_wrap_wxToolBarTool_m_height_get(PyObject *self, PyObject *args) {
+#define wxToolBarTool_m_height_set(_swigobj,_swigval) (_swigobj->m_height = _swigval,_swigval)
+static PyObject *_wrap_wxToolBarTool_m_height_set(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     long  _result;
     wxToolBarTool * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxToolBarTool * _arg0;

+    long  _arg1;

     char * _argc0 = 0;
 
     self = self;
     char * _argc0 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_height_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"sl:wxToolBarTool_m_height_set",&_argc0,&_arg1)) 

         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {

-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_height_get. Expected _wxToolBarTool_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_height_set. Expected _wxToolBarTool_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (long )wxToolBarTool_m_height_get(_arg0);
-    _resultobj = Py_BuildValue("l",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (long )wxToolBarTool_m_height_set(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("l",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxToolBarTool_m_toggleState_get(_swigobj) ((bool ) _swigobj->m_toggleState)
-static PyObject *_wrap_wxToolBarTool_m_toggleState_get(PyObject *self, PyObject *args) {
+#define wxToolBarTool_m_height_get(_swigobj) ((long ) _swigobj->m_height)
+static PyObject *_wrap_wxToolBarTool_m_height_get(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     PyObject * _resultobj;

-    bool  _result;
+    long  _result;

     wxToolBarTool * _arg0;
     char * _argc0 = 0;
 
     self = self;
     wxToolBarTool * _arg0;
     char * _argc0 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_toggleState_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_height_get",&_argc0)) 

         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {

-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_toggleState_get. Expected _wxToolBarTool_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_height_get. Expected _wxToolBarTool_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (bool )wxToolBarTool_m_toggleState_get(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (long )wxToolBarTool_m_height_get(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("l",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxToolBarTool_m_isToggle_get(_swigobj) ((bool ) _swigobj->m_isToggle)
-static PyObject *_wrap_wxToolBarTool_m_isToggle_get(PyObject *self, PyObject *args) {
+#define wxToolBarTool_m_toggleState_set(_swigobj,_swigval) (_swigobj->m_toggleState = _swigval,_swigval)
+static PyObject *_wrap_wxToolBarTool_m_toggleState_set(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;

+    bool  _arg1;

     char * _argc0 = 0;
     char * _argc0 = 0;

+    int tempbool1;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_isToggle_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"si:wxToolBarTool_m_toggleState_set",&_argc0,&tempbool1)) 

         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {

-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_isToggle_get. Expected _wxToolBarTool_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_toggleState_set. Expected _wxToolBarTool_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (bool )wxToolBarTool_m_isToggle_get(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+    _arg1 = (bool ) tempbool1;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxToolBarTool_m_toggleState_set(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxToolBarTool_m_deleteSecondBitmap_get(_swigobj) ((bool ) _swigobj->m_deleteSecondBitmap)
-static PyObject *_wrap_wxToolBarTool_m_deleteSecondBitmap_get(PyObject *self, PyObject *args) {
+#define wxToolBarTool_m_toggleState_get(_swigobj) ((bool ) _swigobj->m_toggleState)
+static PyObject *_wrap_wxToolBarTool_m_toggleState_get(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     char * _argc0 = 0;
 
     self = self;
     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     char * _argc0 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_deleteSecondBitmap_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_toggleState_get",&_argc0)) 

         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {

-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_deleteSecondBitmap_get. Expected _wxToolBarTool_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_toggleState_get. Expected _wxToolBarTool_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (bool )wxToolBarTool_m_deleteSecondBitmap_get(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxToolBarTool_m_toggleState_get(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxToolBarTool_m_enabled_get(_swigobj) ((bool ) _swigobj->m_enabled)
-static PyObject *_wrap_wxToolBarTool_m_enabled_get(PyObject *self, PyObject *args) {
+#define wxToolBarTool_m_isToggle_set(_swigobj,_swigval) (_swigobj->m_isToggle = _swigval,_swigval)
+static PyObject *_wrap_wxToolBarTool_m_isToggle_set(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;

+    bool  _arg1;

     char * _argc0 = 0;
     char * _argc0 = 0;

+    int tempbool1;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_enabled_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"si:wxToolBarTool_m_isToggle_set",&_argc0,&tempbool1)) 

         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {

-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_enabled_get. Expected _wxToolBarTool_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_isToggle_set. Expected _wxToolBarTool_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (bool )wxToolBarTool_m_enabled_get(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+    _arg1 = (bool ) tempbool1;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxToolBarTool_m_isToggle_set(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxToolBarTool_m_bitmap1_get(_swigobj) (&_swigobj->m_bitmap1)
-static PyObject *_wrap_wxToolBarTool_m_bitmap1_get(PyObject *self, PyObject *args) {
+#define wxToolBarTool_m_isToggle_get(_swigobj) ((bool ) _swigobj->m_isToggle)
+static PyObject *_wrap_wxToolBarTool_m_isToggle_get(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     PyObject * _resultobj;

-    wxBitmap * _result;
+    bool  _result;

     wxToolBarTool * _arg0;
     char * _argc0 = 0;
     wxToolBarTool * _arg0;
     char * _argc0 = 0;

-    char _ptemp[128];

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_bitmap1_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_isToggle_get",&_argc0)) 

         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {

-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_bitmap1_get. Expected _wxToolBarTool_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_isToggle_get. Expected _wxToolBarTool_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (wxBitmap *)wxToolBarTool_m_bitmap1_get(_arg0);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxToolBarTool_m_isToggle_get(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxToolBarTool_m_bitmap2_get(_swigobj) (&_swigobj->m_bitmap2)
-static PyObject *_wrap_wxToolBarTool_m_bitmap2_get(PyObject *self, PyObject *args) {
+#define wxToolBarTool_m_deleteSecondBitmap_set(_swigobj,_swigval) (_swigobj->m_deleteSecondBitmap = _swigval,_swigval)
+static PyObject *_wrap_wxToolBarTool_m_deleteSecondBitmap_set(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     PyObject * _resultobj;

-    wxBitmap * _result;
+    bool  _result;

     wxToolBarTool * _arg0;
     wxToolBarTool * _arg0;

+    bool  _arg1;

     char * _argc0 = 0;
     char * _argc0 = 0;

-    char _ptemp[128];
+    int tempbool1;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_bitmap2_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"si:wxToolBarTool_m_deleteSecondBitmap_set",&_argc0,&tempbool1)) 

         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {

-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_bitmap2_get. Expected _wxToolBarTool_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_deleteSecondBitmap_set. Expected _wxToolBarTool_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (wxBitmap *)wxToolBarTool_m_bitmap2_get(_arg0);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+    _arg1 = (bool ) tempbool1;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxToolBarTool_m_deleteSecondBitmap_set(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxToolBarTool_m_isMenuCommand_get(_swigobj) ((bool ) _swigobj->m_isMenuCommand)
-static PyObject *_wrap_wxToolBarTool_m_isMenuCommand_get(PyObject *self, PyObject *args) {
+#define wxToolBarTool_m_deleteSecondBitmap_get(_swigobj) ((bool ) _swigobj->m_deleteSecondBitmap)
+static PyObject *_wrap_wxToolBarTool_m_deleteSecondBitmap_get(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     char * _argc0 = 0;
 
     self = self;
     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     char * _argc0 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_isMenuCommand_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_deleteSecondBitmap_get",&_argc0)) 

         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {

-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_isMenuCommand_get. Expected _wxToolBarTool_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_deleteSecondBitmap_get. Expected _wxToolBarTool_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (bool )wxToolBarTool_m_isMenuCommand_get(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxToolBarTool_m_deleteSecondBitmap_get(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxToolBarTool_m_shortHelpString_get(_swigobj) (&_swigobj->m_shortHelpString)
-static PyObject *_wrap_wxToolBarTool_m_shortHelpString_get(PyObject *self, PyObject *args) {
+#define wxToolBarTool_m_enabled_set(_swigobj,_swigval) (_swigobj->m_enabled = _swigval,_swigval)
+static PyObject *_wrap_wxToolBarTool_m_enabled_set(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     PyObject * _resultobj;

-    wxString * _result;
+    bool  _result;

     wxToolBarTool * _arg0;
     wxToolBarTool * _arg0;

+    bool  _arg1;

     char * _argc0 = 0;
     char * _argc0 = 0;

+    int tempbool1;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_shortHelpString_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"si:wxToolBarTool_m_enabled_set",&_argc0,&tempbool1)) 

         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {

-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_shortHelpString_get. Expected _wxToolBarTool_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_enabled_set. Expected _wxToolBarTool_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (wxString *)wxToolBarTool_m_shortHelpString_get(_arg0);
+    _arg1 = (bool ) tempbool1;

 {
 {

-    _resultobj = PyString_FromString(WXSTRINGCAST (*_result));
-}
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxToolBarTool_m_enabled_set(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxToolBarTool_m_longHelpString_get(_swigobj) (&_swigobj->m_longHelpString)
-static PyObject *_wrap_wxToolBarTool_m_longHelpString_get(PyObject *self, PyObject *args) {
+#define wxToolBarTool_m_enabled_get(_swigobj) ((bool ) _swigobj->m_enabled)
+static PyObject *_wrap_wxToolBarTool_m_enabled_get(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     PyObject * _resultobj;

-    wxString * _result;
+    bool  _result;

     wxToolBarTool * _arg0;
     char * _argc0 = 0;
 
     self = self;
     wxToolBarTool * _arg0;
     char * _argc0 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_longHelpString_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_enabled_get",&_argc0)) 

         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {

-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_longHelpString_get. Expected _wxToolBarTool_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_enabled_get. Expected _wxToolBarTool_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (wxString *)wxToolBarTool_m_longHelpString_get(_arg0);

 {
 {

-    _resultobj = PyString_FromString(WXSTRINGCAST (*_result));
-}
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxToolBarTool_m_enabled_get(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-static void *SwigwxToolBarBaseTowxControl(void *ptr) {
-    wxToolBarBase *src;
-    wxControl *dest;
-    src = (wxToolBarBase *) ptr;
+#define wxToolBarTool_m_bitmap1_set(_swigobj,_swigval) (_swigobj->m_bitmap1 = *(_swigval),_swigval)
+static PyObject *_wrap_wxToolBarTool_m_bitmap1_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxBitmap * _result;
+    wxToolBarTool * _arg0;
+    wxBitmap * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxToolBarTool_m_bitmap1_set",&_argc0,&_argc1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_bitmap1_set. Expected _wxToolBarTool_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBarTool_m_bitmap1_set. Expected _wxBitmap_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxBitmap *)wxToolBarTool_m_bitmap1_set(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+
+#define wxToolBarTool_m_bitmap1_get(_swigobj) (&_swigobj->m_bitmap1)
+static PyObject *_wrap_wxToolBarTool_m_bitmap1_get(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxBitmap * _result;
+    wxToolBarTool * _arg0;
+    char * _argc0 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_bitmap1_get",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_bitmap1_get. Expected _wxToolBarTool_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxBitmap *)wxToolBarTool_m_bitmap1_get(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+
+#define wxToolBarTool_m_bitmap2_set(_swigobj,_swigval) (_swigobj->m_bitmap2 = *(_swigval),_swigval)
+static PyObject *_wrap_wxToolBarTool_m_bitmap2_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxBitmap * _result;
+    wxToolBarTool * _arg0;
+    wxBitmap * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxToolBarTool_m_bitmap2_set",&_argc0,&_argc1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_bitmap2_set. Expected _wxToolBarTool_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBarTool_m_bitmap2_set. Expected _wxBitmap_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxBitmap *)wxToolBarTool_m_bitmap2_set(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+
+#define wxToolBarTool_m_bitmap2_get(_swigobj) (&_swigobj->m_bitmap2)
+static PyObject *_wrap_wxToolBarTool_m_bitmap2_get(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxBitmap * _result;
+    wxToolBarTool * _arg0;
+    char * _argc0 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_bitmap2_get",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_bitmap2_get. Expected _wxToolBarTool_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxBitmap *)wxToolBarTool_m_bitmap2_get(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+
+#define wxToolBarTool_m_isMenuCommand_set(_swigobj,_swigval) (_swigobj->m_isMenuCommand = _swigval,_swigval)
+static PyObject *_wrap_wxToolBarTool_m_isMenuCommand_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxToolBarTool * _arg0;
+    bool  _arg1;
+    char * _argc0 = 0;
+    int tempbool1;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si:wxToolBarTool_m_isMenuCommand_set",&_argc0,&tempbool1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_isMenuCommand_set. Expected _wxToolBarTool_p.");
+        return NULL;
+        }
+    }
+    _arg1 = (bool ) tempbool1;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxToolBarTool_m_isMenuCommand_set(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxToolBarTool_m_isMenuCommand_get(_swigobj) ((bool ) _swigobj->m_isMenuCommand)
+static PyObject *_wrap_wxToolBarTool_m_isMenuCommand_get(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxToolBarTool * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_isMenuCommand_get",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_isMenuCommand_get. Expected _wxToolBarTool_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxToolBarTool_m_isMenuCommand_get(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxToolBarTool_m_shortHelpString_set(_swigobj,_swigval) (_swigobj->m_shortHelpString = *(_swigval),_swigval)
+static PyObject *_wrap_wxToolBarTool_m_shortHelpString_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxString * _result;
+    wxToolBarTool * _arg0;
+    wxString * _arg1;
+    char * _argc0 = 0;
+    PyObject * _obj1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sO:wxToolBarTool_m_shortHelpString_set",&_argc0,&_obj1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_shortHelpString_set. Expected _wxToolBarTool_p.");
+        return NULL;
+        }
+    }
+{
+    if (!PyString_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
+}
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxString *)wxToolBarTool_m_shortHelpString_set(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}{
+    _resultobj = PyString_FromString(WXSTRINGCAST (*_result));
+}
+{
+    if (_obj1)
+        delete _arg1;
+}
+    return _resultobj;
+}
+
+#define wxToolBarTool_m_shortHelpString_get(_swigobj) (&_swigobj->m_shortHelpString)
+static PyObject *_wrap_wxToolBarTool_m_shortHelpString_get(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxString * _result;
+    wxToolBarTool * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_shortHelpString_get",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_shortHelpString_get. Expected _wxToolBarTool_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxString *)wxToolBarTool_m_shortHelpString_get(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}{
+    _resultobj = PyString_FromString(WXSTRINGCAST (*_result));
+}
+    return _resultobj;
+}
+
+#define wxToolBarTool_m_longHelpString_set(_swigobj,_swigval) (_swigobj->m_longHelpString = *(_swigval),_swigval)
+static PyObject *_wrap_wxToolBarTool_m_longHelpString_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxString * _result;
+    wxToolBarTool * _arg0;
+    wxString * _arg1;
+    char * _argc0 = 0;
+    PyObject * _obj1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sO:wxToolBarTool_m_longHelpString_set",&_argc0,&_obj1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_longHelpString_set. Expected _wxToolBarTool_p.");
+        return NULL;
+        }
+    }
+{
+    if (!PyString_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
+}
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxString *)wxToolBarTool_m_longHelpString_set(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}{
+    _resultobj = PyString_FromString(WXSTRINGCAST (*_result));
+}
+{
+    if (_obj1)
+        delete _arg1;
+}
+    return _resultobj;
+}
+
+#define wxToolBarTool_m_longHelpString_get(_swigobj) (&_swigobj->m_longHelpString)
+static PyObject *_wrap_wxToolBarTool_m_longHelpString_get(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxString * _result;
+    wxToolBarTool * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxToolBarTool_m_longHelpString_get",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_longHelpString_get. Expected _wxToolBarTool_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxString *)wxToolBarTool_m_longHelpString_get(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}{
+    _resultobj = PyString_FromString(WXSTRINGCAST (*_result));
+}
+    return _resultobj;
+}
+
+static void *SwigwxToolBarTowxControl(void *ptr) {
+    wxToolBar *src;
+    wxControl *dest;
+    src = (wxToolBar *) ptr;

     dest = (wxControl *) src;
     return (void *) dest;
 }
 
     dest = (wxControl *) src;
     return (void *) dest;
 }
 

-static void *SwigwxToolBarBaseTowxWindow(void *ptr) {
-    wxToolBarBase *src;
+static void *SwigwxToolBarTowxWindow(void *ptr) {
+    wxToolBar *src;

     wxWindow *dest;
     wxWindow *dest;

-    src = (wxToolBarBase *) ptr;
+    src = (wxToolBar *) ptr;

     dest = (wxWindow *) src;
     return (void *) dest;
 }
 
     dest = (wxWindow *) src;
     return (void *) dest;
 }
 

-static void *SwigwxToolBarBaseTowxEvtHandler(void *ptr) {
-    wxToolBarBase *src;
+static void *SwigwxToolBarTowxEvtHandler(void *ptr) {
+    wxToolBar *src;

     wxEvtHandler *dest;
     wxEvtHandler *dest;

-    src = (wxToolBarBase *) ptr;
+    src = (wxToolBar *) ptr;

     dest = (wxEvtHandler *) src;
     return (void *) dest;
 }
 
     dest = (wxEvtHandler *) src;
     return (void *) dest;
 }
 

-#define wxToolBarBase_AddSeparator(_swigobj)  (_swigobj->AddSeparator())
-static PyObject *_wrap_wxToolBarBase_AddSeparator(PyObject *self, PyObject *args) {
+#define new_wxToolBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxToolBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
+static PyObject *_wrap_new_wxToolBar(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     PyObject * _resultobj;

-    wxToolBarBase * _arg0;
+    wxToolBar * _result;
+    wxWindow * _arg0;
+    wxWindowID  _arg1;
+    wxPoint * _arg2 = &wxPyDefaultPosition;
+    wxSize * _arg3 = &wxPyDefaultSize;
+    long  _arg4 = (wxTB_HORIZONTAL)|(wxNO_BORDER);
+    char * _arg5 = "toolBar";

     char * _argc0 = 0;
     char * _argc0 = 0;

+    char * _argc2 = 0;
+    char * _argc3 = 0;
+    char _ptemp[128];

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBarBase_AddSeparator",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"si|ssls:new_wxToolBar",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_arg5)) 

         return NULL;
     if (_argc0) {
         return NULL;
     if (_argc0) {

-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_AddSeparator. Expected _wxToolBarBase_p.");
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxToolBar. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    if (_argc2) {
+        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxToolBar. Expected _wxPoint_p.");
+        return NULL;
+        }
+    }
+    if (_argc3) {
+        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxSize_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxToolBar. Expected _wxSize_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxToolBar *)new_wxToolBar(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBar_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+
+#define wxToolBar_AddSeparator(_swigobj)  (_swigobj->AddSeparator())
+static PyObject *_wrap_wxToolBar_AddSeparator(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxToolBar * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxToolBar_AddSeparator",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_AddSeparator. Expected _wxToolBar_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    wxToolBarBase_AddSeparator(_arg0);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxToolBar_AddSeparator(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
     _resultobj = Py_None;
     return _resultobj;
 }
 

-static wxToolBarTool * wxToolBarBase_AddTool(wxToolBarBase *self,int  toolIndex,const wxBitmap & bitmap1,const wxBitmap & bitmap2,int  isToggle,long  xPos,long  yPos,const wxString & shortHelpString,const wxString & longHelpString) {
-            return self->AddTool(toolIndex, bitmap1, bitmap2,
-                                 isToggle, xPos, yPos, NULL,
+static wxToolBarTool * wxToolBar_AddTool(wxToolBar *self,int  toolIndex,const wxBitmap & bitmap1,const wxBitmap & bitmap2,int  isToggle,long  xPos,long  yPos,const wxString & shortHelpString,const wxString & longHelpString) {
+            return self->AddTool(toolIndex, bitmap1, bitmap2,
+                                 isToggle, xPos, yPos, NULL,
+                                 shortHelpString, longHelpString);
+        }
+static PyObject *_wrap_wxToolBar_AddTool(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxToolBarTool * _result;
+    wxToolBar * _arg0;
+    int  _arg1;
+    wxBitmap * _arg2;
+    wxBitmap * _arg3 = &wxNullBitmap;
+    int  _arg4 = (0);
+    long  _arg5 = -1;
+    long  _arg6 = -1;
+    wxString * _arg7 = &wxPyEmptyStr;
+    wxString * _arg8 = &wxPyEmptyStr;
+    char * _argc0 = 0;
+    char * _argc2 = 0;
+    char * _argc3 = 0;
+    PyObject * _obj7 = 0;
+    PyObject * _obj8 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sis|sillOO:wxToolBar_AddTool",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_arg5,&_arg6,&_obj7,&_obj8)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_AddTool. Expected _wxToolBar_p.");
+        return NULL;
+        }
+    }
+    if (_argc2) {
+        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxBitmap_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxToolBar_AddTool. Expected _wxBitmap_p.");
+        return NULL;
+        }
+    }
+    if (_argc3) {
+        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxBitmap_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxToolBar_AddTool. Expected _wxBitmap_p.");
+        return NULL;
+        }
+    }
+    if (_obj7)
+{
+    if (!PyString_Check(_obj7)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg7 = new wxString(PyString_AsString(_obj7), PyString_Size(_obj7));
+}
+    if (_obj8)
+{
+    if (!PyString_Check(_obj8)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg8 = new wxString(PyString_AsString(_obj8), PyString_Size(_obj8));
+}
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxToolBarTool *)wxToolBar_AddTool(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5,_arg6,*_arg7,*_arg8);
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarTool_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+{
+    if (_obj7)
+        delete _arg7;
+}
+{
+    if (_obj8)
+        delete _arg8;
+}
+    return _resultobj;
+}
+
+static wxToolBarTool * wxToolBar_AddSimpleTool(wxToolBar *self,int  toolIndex,const wxBitmap & bitmap,const wxString & shortHelpString,const wxString & longHelpString) {
+            return self->AddTool(toolIndex, bitmap, wxNullBitmap,
+                                 FALSE, -1, -1, NULL,

                                  shortHelpString, longHelpString);
         }
                                  shortHelpString, longHelpString);
         }

-static PyObject *_wrap_wxToolBarBase_AddTool(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_AddSimpleTool(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     wxToolBarTool * _result;
     PyObject * _resultobj;
     wxToolBarTool * _result;

-    wxToolBarBase * _arg0;
+    wxToolBar * _arg0;

     int  _arg1;
     wxBitmap * _arg2;
     int  _arg1;
     wxBitmap * _arg2;

-    wxBitmap * _arg3 = &wxNullBitmap;
-    int  _arg4 = (0);
-    long  _arg5 = -1;
-    long  _arg6 = -1;
-    wxString * _arg7 = &wxPyEmptyStr;
-    wxString * _arg8 = &wxPyEmptyStr;
+    wxString * _arg3 = &wxPyEmptyStr;
+    wxString * _arg4 = &wxPyEmptyStr;

     char * _argc0 = 0;
     char * _argc2 = 0;
     char * _argc0 = 0;
     char * _argc2 = 0;

-    char * _argc3 = 0;
-    PyObject * _obj7 = 0;
-    PyObject * _obj8 = 0;
+    PyObject * _obj3 = 0;
+    PyObject * _obj4 = 0;

     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sis|sillOO:wxToolBarBase_AddTool",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_arg5,&_arg6,&_obj7,&_obj8)) 
+    if(!PyArg_ParseTuple(args,"sis|OO:wxToolBar_AddSimpleTool",&_argc0,&_arg1,&_argc2,&_obj3,&_obj4)) 

         return NULL;
     if (_argc0) {
         return NULL;
     if (_argc0) {

-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_AddTool. Expected _wxToolBarBase_p.");
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_AddSimpleTool. Expected _wxToolBar_p.");

         return NULL;
         }
     }
     if (_argc2) {
         if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxBitmap_p")) {
         return NULL;
         }
     }
     if (_argc2) {
         if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxBitmap_p")) {

-            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxToolBarBase_AddTool. Expected _wxBitmap_p.");
-        return NULL;
-        }
-    }
-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxBitmap_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxToolBarBase_AddTool. Expected _wxBitmap_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxToolBar_AddSimpleTool. Expected _wxBitmap_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    if (_obj7)
+    if (_obj3)

 {
 {

-    if (!PyString_Check(_obj7)) {
+    if (!PyString_Check(_obj3)) {

         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }

-    _arg7 = new wxString(PyString_AsString(_obj7));
+    _arg3 = new wxString(PyString_AsString(_obj3), PyString_Size(_obj3));

 }
 }

-    if (_obj8)
+    if (_obj4)

 {
 {

-    if (!PyString_Check(_obj8)) {
+    if (!PyString_Check(_obj4)) {

         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }

-    _arg8 = new wxString(PyString_AsString(_obj8));
+    _arg4 = new wxString(PyString_AsString(_obj4), PyString_Size(_obj4));

 }
 }

-    _result = (wxToolBarTool *)wxToolBarBase_AddTool(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5,_arg6,*_arg7,*_arg8);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarTool_p");
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxToolBarTool *)wxToolBar_AddSimpleTool(_arg0,_arg1,*_arg2,*_arg3,*_arg4);
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarTool_p");

     _resultobj = Py_BuildValue("s",_ptemp);
 {
     _resultobj = Py_BuildValue("s",_ptemp);
 {

-    if (_obj7)
-        delete _arg7;
+    if (_obj3)
+        delete _arg3;

 }
 {
 }
 {

-    if (_obj8)
-        delete _arg8;
+    if (_obj4)
+        delete _arg4;

 }
     return _resultobj;
 }
 
 }
     return _resultobj;
 }
 

-#define wxToolBarBase_EnableTool(_swigobj,_swigarg0,_swigarg1)  (_swigobj->EnableTool(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxToolBarBase_EnableTool(PyObject *self, PyObject *args) {
+#define wxToolBar_EnableTool(_swigobj,_swigarg0,_swigarg1)  (_swigobj->EnableTool(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxToolBar_EnableTool(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     PyObject * _resultobj;

-    wxToolBarBase * _arg0;
+    wxToolBar * _arg0;

     int  _arg1;
     bool  _arg2;
     char * _argc0 = 0;
     int tempbool2;
 
     self = self;
     int  _arg1;
     bool  _arg2;
     char * _argc0 = 0;
     int tempbool2;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxToolBarBase_EnableTool",&_argc0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTuple(args,"sii:wxToolBar_EnableTool",&_argc0,&_arg1,&tempbool2)) 

         return NULL;
     if (_argc0) {
         return NULL;
     if (_argc0) {

-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_EnableTool. Expected _wxToolBarBase_p.");
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_EnableTool. Expected _wxToolBar_p.");

         return NULL;
         }
     }
     _arg2 = (bool ) tempbool2;
         return NULL;
         }
     }
     _arg2 = (bool ) tempbool2;

-    wxToolBarBase_EnableTool(_arg0,_arg1,_arg2);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxToolBar_EnableTool(_arg0,_arg1,_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
     _resultobj = Py_None;
     return _resultobj;
 }
 

-#define wxToolBarBase_FindToolForPosition(_swigobj,_swigarg0,_swigarg1)  (_swigobj->FindToolForPosition(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxToolBarBase_FindToolForPosition(PyObject *self, PyObject *args) {
+#define wxToolBar_FindToolForPosition(_swigobj,_swigarg0,_swigarg1)  (_swigobj->FindToolForPosition(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxToolBar_FindToolForPosition(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     wxToolBarTool * _result;
     PyObject * _resultobj;
     wxToolBarTool * _result;

-    wxToolBarBase * _arg0;
+    wxToolBar * _arg0;

     float  _arg1;
     float  _arg2;
     char * _argc0 = 0;
     char _ptemp[128];
 
     self = self;
     float  _arg1;
     float  _arg2;
     char * _argc0 = 0;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sff:wxToolBarBase_FindToolForPosition",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"sff:wxToolBar_FindToolForPosition",&_argc0,&_arg1,&_arg2)) 

         return NULL;
     if (_argc0) {
         return NULL;
     if (_argc0) {

-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_FindToolForPosition. Expected _wxToolBarBase_p.");
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_FindToolForPosition. Expected _wxToolBar_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (wxToolBarTool *)wxToolBarBase_FindToolForPosition(_arg0,_arg1,_arg2);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarTool_p");
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxToolBarTool *)wxToolBar_FindToolForPosition(_arg0,_arg1,_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarTool_p");

     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
 
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
 

-#define wxToolBarBase_GetToolSize(_swigobj)  (_swigobj->GetToolSize())
-static PyObject *_wrap_wxToolBarBase_GetToolSize(PyObject *self, PyObject *args) {
+#define wxToolBar_GetToolSize(_swigobj)  (_swigobj->GetToolSize())
+static PyObject *_wrap_wxToolBar_GetToolSize(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     wxSize * _result;
     PyObject * _resultobj;
     wxSize * _result;

-    wxToolBarBase * _arg0;
+    wxToolBar * _arg0;

     char * _argc0 = 0;
     char _ptemp[128];
 
     self = self;
     char * _argc0 = 0;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBarBase_GetToolSize",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"s:wxToolBar_GetToolSize",&_argc0)) 

         return NULL;
     if (_argc0) {
         return NULL;
     if (_argc0) {

-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_GetToolSize. Expected _wxToolBarBase_p.");
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolSize. Expected _wxToolBar_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = new wxSize (wxToolBarBase_GetToolSize(_arg0));
-    SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p");
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxSize (wxToolBar_GetToolSize(_arg0));
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p");

     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
 
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
 

-#define wxToolBarBase_GetToolBitmapSize(_swigobj)  (_swigobj->GetToolBitmapSize())
-static PyObject *_wrap_wxToolBarBase_GetToolBitmapSize(PyObject *self, PyObject *args) {
+#define wxToolBar_GetToolBitmapSize(_swigobj)  (_swigobj->GetToolBitmapSize())
+static PyObject *_wrap_wxToolBar_GetToolBitmapSize(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     wxSize * _result;
     PyObject * _resultobj;
     wxSize * _result;

-    wxToolBarBase * _arg0;
+    wxToolBar * _arg0;

     char * _argc0 = 0;
     char _ptemp[128];
 
     self = self;
     char * _argc0 = 0;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBarBase_GetToolBitmapSize",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"s:wxToolBar_GetToolBitmapSize",&_argc0)) 

         return NULL;
     if (_argc0) {
         return NULL;
     if (_argc0) {

-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_GetToolBitmapSize. Expected _wxToolBarBase_p.");
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolBitmapSize. Expected _wxToolBar_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = new wxSize (wxToolBarBase_GetToolBitmapSize(_arg0));
-    SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p");
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxSize (wxToolBar_GetToolBitmapSize(_arg0));
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p");

     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
 
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
 

-#define wxToolBarBase_GetMaxSize(_swigobj)  (_swigobj->GetMaxSize())
-static PyObject *_wrap_wxToolBarBase_GetMaxSize(PyObject *self, PyObject *args) {
+#define wxToolBar_SetToolBitmapSize(_swigobj,_swigarg0)  (_swigobj->SetToolBitmapSize(_swigarg0))
+static PyObject *_wrap_wxToolBar_SetToolBitmapSize(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxToolBar * _arg0;
+    wxSize * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxToolBar_SetToolBitmapSize",&_argc0,&_argc1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_SetToolBitmapSize. Expected _wxToolBar_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxSize_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBar_SetToolBitmapSize. Expected _wxSize_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxToolBar_SetToolBitmapSize(_arg0,*_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxToolBar_GetMaxSize(_swigobj)  (_swigobj->GetMaxSize())
+static PyObject *_wrap_wxToolBar_GetMaxSize(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     wxSize * _result;
     PyObject * _resultobj;
     wxSize * _result;

-    wxToolBarBase * _arg0;
+    wxToolBar * _arg0;

     char * _argc0 = 0;
     char _ptemp[128];
 
     self = self;
     char * _argc0 = 0;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBarBase_GetMaxSize",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"s:wxToolBar_GetMaxSize",&_argc0)) 

         return NULL;
     if (_argc0) {
         return NULL;
     if (_argc0) {

-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_GetMaxSize. Expected _wxToolBarBase_p.");
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetMaxSize. Expected _wxToolBar_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = new wxSize (wxToolBarBase_GetMaxSize(_arg0));
-    SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p");
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxSize (wxToolBar_GetMaxSize(_arg0));
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p");

     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
 
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
 }
 

-#define wxToolBarBase_GetToolEnabled(_swigobj,_swigarg0)  (_swigobj->GetToolEnabled(_swigarg0))
-static PyObject *_wrap_wxToolBarBase_GetToolEnabled(PyObject *self, PyObject *args) {
+#define wxToolBar_GetToolEnabled(_swigobj,_swigarg0)  (_swigobj->GetToolEnabled(_swigarg0))
+static PyObject *_wrap_wxToolBar_GetToolEnabled(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     bool  _result;
     PyObject * _resultobj;
     bool  _result;

-    wxToolBarBase * _arg0;
+    wxToolBar * _arg0;

     int  _arg1;
     char * _argc0 = 0;
 
     self = self;
     int  _arg1;
     char * _argc0 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxToolBarBase_GetToolEnabled",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"si:wxToolBar_GetToolEnabled",&_argc0,&_arg1)) 

         return NULL;
     if (_argc0) {
         return NULL;
     if (_argc0) {

-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_GetToolEnabled. Expected _wxToolBarBase_p.");
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolEnabled. Expected _wxToolBar_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (bool )wxToolBarBase_GetToolEnabled(_arg0,_arg1);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxToolBar_GetToolEnabled(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxToolBarBase_GetToolLongHelp(_swigobj,_swigarg0)  (_swigobj->GetToolLongHelp(_swigarg0))
-static PyObject *_wrap_wxToolBarBase_GetToolLongHelp(PyObject *self, PyObject *args) {
+#define wxToolBar_GetToolLongHelp(_swigobj,_swigarg0)  (_swigobj->GetToolLongHelp(_swigarg0))
+static PyObject *_wrap_wxToolBar_GetToolLongHelp(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     wxString * _result;
     PyObject * _resultobj;
     wxString * _result;

-    wxToolBarBase * _arg0;
+    wxToolBar * _arg0;

     int  _arg1;
     char * _argc0 = 0;
 
     self = self;
     int  _arg1;
     char * _argc0 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxToolBarBase_GetToolLongHelp",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"si:wxToolBar_GetToolLongHelp",&_argc0,&_arg1)) 

         return NULL;
     if (_argc0) {
         return NULL;
     if (_argc0) {

-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_GetToolLongHelp. Expected _wxToolBarBase_p.");
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolLongHelp. Expected _wxToolBar_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = new wxString (wxToolBarBase_GetToolLongHelp(_arg0,_arg1));

 {
 {

+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxString (wxToolBar_GetToolLongHelp(_arg0,_arg1));
+
+    wxPy_END_ALLOW_THREADS;
+}{

     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
 {
     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
 {


@@ -1160,67 +1952,79 @@ static PyObject *_wrap_wxToolBarBase_GetToolLongHelp(PyObject *self, PyObject *a
     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxToolBarBase_GetToolPacking(_swigobj)  (_swigobj->GetToolPacking())
-static PyObject *_wrap_wxToolBarBase_GetToolPacking(PyObject *self, PyObject *args) {
+#define wxToolBar_GetToolPacking(_swigobj)  (_swigobj->GetToolPacking())
+static PyObject *_wrap_wxToolBar_GetToolPacking(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     int  _result;
     PyObject * _resultobj;
     int  _result;

-    wxToolBarBase * _arg0;
+    wxToolBar * _arg0;

     char * _argc0 = 0;
 
     self = self;
     char * _argc0 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBarBase_GetToolPacking",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"s:wxToolBar_GetToolPacking",&_argc0)) 

         return NULL;
     if (_argc0) {
         return NULL;
     if (_argc0) {

-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_GetToolPacking. Expected _wxToolBarBase_p.");
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolPacking. Expected _wxToolBar_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (int )wxToolBarBase_GetToolPacking(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (int )wxToolBar_GetToolPacking(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxToolBarBase_GetToolSeparation(_swigobj)  (_swigobj->GetToolSeparation())
-static PyObject *_wrap_wxToolBarBase_GetToolSeparation(PyObject *self, PyObject *args) {
+#define wxToolBar_GetToolSeparation(_swigobj)  (_swigobj->GetToolSeparation())
+static PyObject *_wrap_wxToolBar_GetToolSeparation(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     int  _result;
     PyObject * _resultobj;
     int  _result;

-    wxToolBarBase * _arg0;
+    wxToolBar * _arg0;

     char * _argc0 = 0;
 
     self = self;
     char * _argc0 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxToolBarBase_GetToolSeparation",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"s:wxToolBar_GetToolSeparation",&_argc0)) 

         return NULL;
     if (_argc0) {
         return NULL;
     if (_argc0) {

-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_GetToolSeparation. Expected _wxToolBarBase_p.");
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolSeparation. Expected _wxToolBar_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (int )wxToolBarBase_GetToolSeparation(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (int )wxToolBar_GetToolSeparation(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxToolBarBase_GetToolShortHelp(_swigobj,_swigarg0)  (_swigobj->GetToolShortHelp(_swigarg0))
-static PyObject *_wrap_wxToolBarBase_GetToolShortHelp(PyObject *self, PyObject *args) {
+#define wxToolBar_GetToolShortHelp(_swigobj,_swigarg0)  (_swigobj->GetToolShortHelp(_swigarg0))
+static PyObject *_wrap_wxToolBar_GetToolShortHelp(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     wxString * _result;
     PyObject * _resultobj;
     wxString * _result;

-    wxToolBarBase * _arg0;
+    wxToolBar * _arg0;

     int  _arg1;
     char * _argc0 = 0;
 
     self = self;
     int  _arg1;
     char * _argc0 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxToolBarBase_GetToolShortHelp",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"si:wxToolBar_GetToolShortHelp",&_argc0,&_arg1)) 

         return NULL;
     if (_argc0) {
         return NULL;
     if (_argc0) {

-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_GetToolShortHelp. Expected _wxToolBarBase_p.");
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolShortHelp. Expected _wxToolBar_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = new wxString (wxToolBarBase_GetToolShortHelp(_arg0,_arg1));

 {
 {

+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxString (wxToolBar_GetToolShortHelp(_arg0,_arg1));
+
+    wxPy_END_ALLOW_THREADS;
+}{

     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
 {
     _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
 }
 {


@@ -1229,122 +2033,72 @@ static PyObject *_wrap_wxToolBarBase_GetToolShortHelp(PyObject *self, PyObject *
     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxToolBarBase_GetToolState(_swigobj,_swigarg0)  (_swigobj->GetToolState(_swigarg0))
-static PyObject *_wrap_wxToolBarBase_GetToolState(PyObject *self, PyObject *args) {
+#define wxToolBar_GetToolState(_swigobj,_swigarg0)  (_swigobj->GetToolState(_swigarg0))
+static PyObject *_wrap_wxToolBar_GetToolState(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     bool  _result;
     PyObject * _resultobj;
     bool  _result;

-    wxToolBarBase * _arg0;
+    wxToolBar * _arg0;

     int  _arg1;
     char * _argc0 = 0;
 
     self = self;
     int  _arg1;
     char * _argc0 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxToolBarBase_GetToolState",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"si:wxToolBar_GetToolState",&_argc0,&_arg1)) 

         return NULL;
     if (_argc0) {
         return NULL;
     if (_argc0) {

-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_GetToolState. Expected _wxToolBarBase_p.");
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolState. Expected _wxToolBar_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (bool )wxToolBarBase_GetToolState(_arg0,_arg1);
-    _resultobj = Py_BuildValue("i",_result);
-    return _resultobj;
-}
-
-#define wxToolBarBase_Realize(_swigobj)  (_swigobj->Realize())
-static PyObject *_wrap_wxToolBarBase_Realize(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    bool  _result;
-    wxToolBarBase * _arg0;
-    char * _argc0 = 0;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxToolBar_GetToolState(_arg0,_arg1);

 
 

-    self = self;
-    if(!PyArg_ParseTuple(args,"s:wxToolBarBase_Realize",&_argc0)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_Realize. Expected _wxToolBarBase_p.");
-        return NULL;
-        }
-    }
-    _result = (bool )wxToolBarBase_Realize(_arg0);
-    _resultobj = Py_BuildValue("i",_result);
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxToolBarBase_SetToolBitmapSize(_swigobj,_swigarg0)  (_swigobj->SetToolBitmapSize(_swigarg0))
-static PyObject *_wrap_wxToolBarBase_SetToolBitmapSize(PyObject *self, PyObject *args) {
+#define wxToolBar_Realize(_swigobj)  (_swigobj->Realize())
+static PyObject *_wrap_wxToolBar_Realize(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     PyObject * _resultobj;

-    wxToolBarBase * _arg0;
-    wxSize * _arg1;
+    bool  _result;
+    wxToolBar * _arg0;

     char * _argc0 = 0;
     char * _argc0 = 0;

-    char * _argc1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"ss:wxToolBarBase_SetToolBitmapSize",&_argc0,&_argc1)) 
+    if(!PyArg_ParseTuple(args,"s:wxToolBar_Realize",&_argc0)) 

         return NULL;
     if (_argc0) {
         return NULL;
     if (_argc0) {

-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_SetToolBitmapSize. Expected _wxToolBarBase_p.");
-        return NULL;
-        }
-    }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxSize_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBarBase_SetToolBitmapSize. Expected _wxSize_p.");
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_Realize. Expected _wxToolBar_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    wxToolBarBase_SetToolBitmapSize(_arg0,*_arg1);
-    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-    return _resultobj;
-}
-
-#define wxToolBarBase_SetMargins(_swigobj,_swigarg0)  (_swigobj->SetMargins(_swigarg0))
-static PyObject *_wrap_wxToolBarBase_SetMargins(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxToolBarBase * _arg0;
-    wxSize * _arg1;
-    char * _argc0 = 0;
-    char * _argc1 = 0;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxToolBar_Realize(_arg0);

 
 

-    self = self;
-    if(!PyArg_ParseTuple(args,"ss:wxToolBarBase_SetMargins",&_argc0,&_argc1)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_SetMargins. Expected _wxToolBarBase_p.");
-        return NULL;
-        }
-    }
-    if (_argc1) {
-        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxSize_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBarBase_SetMargins. Expected _wxSize_p.");
-        return NULL;
-        }
-    }
-    wxToolBarBase_SetMargins(_arg0,*_arg1);
-    Py_INCREF(Py_None);
-    _resultobj = Py_None;
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);

     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxToolBarBase_SetToolLongHelp(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetToolLongHelp(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxToolBarBase_SetToolLongHelp(PyObject *self, PyObject *args) {
+#define wxToolBar_SetToolLongHelp(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetToolLongHelp(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxToolBar_SetToolLongHelp(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     PyObject * _resultobj;

-    wxToolBarBase * _arg0;
+    wxToolBar * _arg0;

     int  _arg1;
     wxString * _arg2;
     char * _argc0 = 0;
     PyObject * _obj2 = 0;
 
     self = self;
     int  _arg1;
     wxString * _arg2;
     char * _argc0 = 0;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siO:wxToolBarBase_SetToolLongHelp",&_argc0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"siO:wxToolBar_SetToolLongHelp",&_argc0,&_arg1,&_obj2)) 

         return NULL;
     if (_argc0) {
         return NULL;
     if (_argc0) {

-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_SetToolLongHelp. Expected _wxToolBarBase_p.");
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_SetToolLongHelp. Expected _wxToolBar_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }


@@ -1353,10 +2107,14 @@ static PyObject *_wrap_wxToolBarBase_SetToolLongHelp(PyObject *self, PyObject *a
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }

-    _arg2 = new wxString(PyString_AsString(_obj2));
+    _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));

 }
 }

-    wxToolBarBase_SetToolLongHelp(_arg0,_arg1,*_arg2);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxToolBar_SetToolLongHelp(_arg0,_arg1,*_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
 {
     if (_obj2)
     _resultobj = Py_None;
 {
     if (_obj2)


@@ -1365,43 +2123,21 @@ static PyObject *_wrap_wxToolBarBase_SetToolLongHelp(PyObject *self, PyObject *a
     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxToolBarBase_SetToolPacking(_swigobj,_swigarg0)  (_swigobj->SetToolPacking(_swigarg0))
-static PyObject *_wrap_wxToolBarBase_SetToolPacking(PyObject *self, PyObject *args) {
-    PyObject * _resultobj;
-    wxToolBarBase * _arg0;
-    int  _arg1;
-    char * _argc0 = 0;
-
-    self = self;
-    if(!PyArg_ParseTuple(args,"si:wxToolBarBase_SetToolPacking",&_argc0,&_arg1)) 
-        return NULL;
-    if (_argc0) {
-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_SetToolPacking. Expected _wxToolBarBase_p.");
-        return NULL;
-        }
-    }
-    wxToolBarBase_SetToolPacking(_arg0,_arg1);
-    Py_INCREF(Py_None);
-    _resultobj = Py_None;
-    return _resultobj;
-}
-
-#define wxToolBarBase_SetToolShortHelp(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetToolShortHelp(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxToolBarBase_SetToolShortHelp(PyObject *self, PyObject *args) {
+#define wxToolBar_SetToolShortHelp(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetToolShortHelp(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxToolBar_SetToolShortHelp(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     PyObject * _resultobj;

-    wxToolBarBase * _arg0;
+    wxToolBar * _arg0;

     int  _arg1;
     wxString * _arg2;
     char * _argc0 = 0;
     PyObject * _obj2 = 0;
 
     self = self;
     int  _arg1;
     wxString * _arg2;
     char * _argc0 = 0;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"siO:wxToolBarBase_SetToolShortHelp",&_argc0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"siO:wxToolBar_SetToolShortHelp",&_argc0,&_arg1,&_obj2)) 

         return NULL;
     if (_argc0) {
         return NULL;
     if (_argc0) {

-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_SetToolShortHelp. Expected _wxToolBarBase_p.");
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_SetToolShortHelp. Expected _wxToolBar_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }


@@ -1410,10 +2146,14 @@ static PyObject *_wrap_wxToolBarBase_SetToolShortHelp(PyObject *self, PyObject *
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }
         PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
         return NULL;
     }

-    _arg2 = new wxString(PyString_AsString(_obj2));
+    _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));

 }
 }

-    wxToolBarBase_SetToolShortHelp(_arg0,_arg1,*_arg2);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxToolBar_SetToolShortHelp(_arg0,_arg1,*_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
 {
     if (_obj2)
     _resultobj = Py_None;
 {
     if (_obj2)


@@ -1422,241 +2162,176 @@ static PyObject *_wrap_wxToolBarBase_SetToolShortHelp(PyObject *self, PyObject *
     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxToolBarBase_SetToolSeparation(_swigobj,_swigarg0)  (_swigobj->SetToolSeparation(_swigarg0))
-static PyObject *_wrap_wxToolBarBase_SetToolSeparation(PyObject *self, PyObject *args) {
+#define wxToolBar_SetMargins(_swigobj,_swigarg0)  (_swigobj->SetMargins(_swigarg0))
+static PyObject *_wrap_wxToolBar_SetMargins(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     PyObject * _resultobj;

-    wxToolBarBase * _arg0;
-    int  _arg1;
+    wxToolBar * _arg0;
+    wxSize * _arg1;

     char * _argc0 = 0;
     char * _argc0 = 0;

+    char * _argc1 = 0;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si:wxToolBarBase_SetToolSeparation",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"ss:wxToolBar_SetMargins",&_argc0,&_argc1)) 

         return NULL;
     if (_argc0) {
         return NULL;
     if (_argc0) {

-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_SetToolSeparation. Expected _wxToolBarBase_p.");
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_SetMargins. Expected _wxToolBar_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxSize_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBar_SetMargins. Expected _wxSize_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    wxToolBarBase_SetToolSeparation(_arg0,_arg1);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxToolBar_SetMargins(_arg0,*_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
     _resultobj = Py_None;
     return _resultobj;
 }
 

-#define wxToolBarBase_ToggleTool(_swigobj,_swigarg0,_swigarg1)  (_swigobj->ToggleTool(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxToolBarBase_ToggleTool(PyObject *self, PyObject *args) {
+#define wxToolBar_SetToolPacking(_swigobj,_swigarg0)  (_swigobj->SetToolPacking(_swigarg0))
+static PyObject *_wrap_wxToolBar_SetToolPacking(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     PyObject * _resultobj;

-    wxToolBarBase * _arg0;
+    wxToolBar * _arg0;

     int  _arg1;
     int  _arg1;

-    bool  _arg2;

     char * _argc0 = 0;
     char * _argc0 = 0;

-    int tempbool2;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxToolBarBase_ToggleTool",&_argc0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTuple(args,"si:wxToolBar_SetToolPacking",&_argc0,&_arg1)) 

         return NULL;
     if (_argc0) {
         return NULL;
     if (_argc0) {

-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarBase_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_ToggleTool. Expected _wxToolBarBase_p.");
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_SetToolPacking. Expected _wxToolBar_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    _arg2 = (bool ) tempbool2;
-    wxToolBarBase_ToggleTool(_arg0,_arg1,_arg2);
-    Py_INCREF(Py_None);
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxToolBar_SetToolPacking(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);

     _resultobj = Py_None;
     return _resultobj;
 }
 
     _resultobj = Py_None;
     return _resultobj;
 }
 

-static void *SwigwxToolBarTowxToolBarBase(void *ptr) {
-    wxToolBar *src;
-    wxToolBarBase *dest;
-    src = (wxToolBar *) ptr;
-    dest = (wxToolBarBase *) src;
-    return (void *) dest;
-}
-
-static void *SwigwxToolBarTowxControl(void *ptr) {
-    wxToolBar *src;
-    wxControl *dest;
-    src = (wxToolBar *) ptr;
-    dest = (wxControl *) src;
-    return (void *) dest;
-}
-
-static void *SwigwxToolBarTowxWindow(void *ptr) {
-    wxToolBar *src;
-    wxWindow *dest;
-    src = (wxToolBar *) ptr;
-    dest = (wxWindow *) src;
-    return (void *) dest;
-}
-
-static void *SwigwxToolBarTowxEvtHandler(void *ptr) {
-    wxToolBar *src;
-    wxEvtHandler *dest;
-    src = (wxToolBar *) ptr;
-    dest = (wxEvtHandler *) src;
-    return (void *) dest;
-}
-
-#define new_wxToolBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxToolBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
-static PyObject *_wrap_new_wxToolBar(PyObject *self, PyObject *args) {
+#define wxToolBar_SetToolSeparation(_swigobj,_swigarg0)  (_swigobj->SetToolSeparation(_swigarg0))
+static PyObject *_wrap_wxToolBar_SetToolSeparation(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     PyObject * _resultobj;

-    wxToolBar * _result;
-    wxWindow * _arg0;
-    wxWindowID  _arg1;
-    wxPoint * _arg2 = &wxPyDefaultPosition;
-    wxSize * _arg3 = &wxPyDefaultSize;
-    long  _arg4 = (wxTB_HORIZONTAL)|(wxNO_BORDER);
-    char * _arg5 = "toolBar";
+    wxToolBar * _arg0;
+    int  _arg1;

     char * _argc0 = 0;
     char * _argc0 = 0;

-    char * _argc2 = 0;
-    char * _argc3 = 0;
-    char _ptemp[128];

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si|ssls:new_wxToolBar",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTuple(args,"si:wxToolBar_SetToolSeparation",&_argc0,&_arg1)) 

         return NULL;
     if (_argc0) {
         return NULL;
     if (_argc0) {

-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxToolBar. Expected _wxWindow_p.");
-        return NULL;
-        }
-    }
-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxToolBar. Expected _wxPoint_p.");
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_SetToolSeparation. Expected _wxToolBar_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxSize_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxToolBar. Expected _wxSize_p.");
-        return NULL;
-        }
-    }
-    _result = (wxToolBar *)new_wxToolBar(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBar_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
-    return _resultobj;
-}
-
-static void *SwigwxToolBarSimpleTowxToolBarBase(void *ptr) {
-    wxToolBarSimple *src;
-    wxToolBarBase *dest;
-    src = (wxToolBarSimple *) ptr;
-    dest = (wxToolBarBase *) src;
-    return (void *) dest;
-}
-
-static void *SwigwxToolBarSimpleTowxControl(void *ptr) {
-    wxToolBarSimple *src;
-    wxControl *dest;
-    src = (wxToolBarSimple *) ptr;
-    dest = (wxControl *) src;
-    return (void *) dest;
-}
-
-static void *SwigwxToolBarSimpleTowxWindow(void *ptr) {
-    wxToolBarSimple *src;
-    wxWindow *dest;
-    src = (wxToolBarSimple *) ptr;
-    dest = (wxWindow *) src;
-    return (void *) dest;
-}
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxToolBar_SetToolSeparation(_arg0,_arg1);

 
 

-static void *SwigwxToolBarSimpleTowxEvtHandler(void *ptr) {
-    wxToolBarSimple *src;
-    wxEvtHandler *dest;
-    src = (wxToolBarSimple *) ptr;
-    dest = (wxEvtHandler *) src;
-    return (void *) dest;
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;

 }
 
 }
 

-#define new_wxToolBarSimple(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxToolBarSimple(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
-static PyObject *_wrap_new_wxToolBarSimple(PyObject *self, PyObject *args) {
+#define wxToolBar_ToggleTool(_swigobj,_swigarg0,_swigarg1)  (_swigobj->ToggleTool(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxToolBar_ToggleTool(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     PyObject * _resultobj;

-    wxToolBarSimple * _result;
-    wxWindow * _arg0;
-    wxWindowID  _arg1;
-    wxPoint * _arg2 = &wxPyDefaultPosition;
-    wxSize * _arg3 = &wxPyDefaultSize;
-    long  _arg4 = (wxTB_HORIZONTAL)|(wxNO_BORDER);
-    char * _arg5 = "toolBar";
+    wxToolBar * _arg0;
+    int  _arg1;
+    bool  _arg2;

     char * _argc0 = 0;
     char * _argc0 = 0;

-    char * _argc2 = 0;
-    char * _argc3 = 0;
-    char _ptemp[128];
+    int tempbool2;

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"si|ssls:new_wxToolBarSimple",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTuple(args,"sii:wxToolBar_ToggleTool",&_argc0,&_arg1,&tempbool2)) 

         return NULL;
     if (_argc0) {
         return NULL;
     if (_argc0) {

-        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxToolBarSimple. Expected _wxWindow_p.");
-        return NULL;
-        }
-    }
-    if (_argc2) {
-        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxToolBarSimple. Expected _wxPoint_p.");
-        return NULL;
-        }
-    }
-    if (_argc3) {
-        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxSize_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxToolBarSimple. Expected _wxSize_p.");
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_ToggleTool. Expected _wxToolBar_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (wxToolBarSimple *)new_wxToolBarSimple(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
-    SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolBarSimple_p");
-    _resultobj = Py_BuildValue("s",_ptemp);
+    _arg2 = (bool ) tempbool2;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxToolBar_ToggleTool(_arg0,_arg1,_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;

     return _resultobj;
 }
 
 static PyMethodDef stattoolcMethods[] = {
     return _resultobj;
 }
 
 static PyMethodDef stattoolcMethods[] = {

-        { "new_wxToolBarSimple", _wrap_new_wxToolBarSimple, 1 },
+        { "wxToolBar_ToggleTool", _wrap_wxToolBar_ToggleTool, 1 },
+        { "wxToolBar_SetToolSeparation", _wrap_wxToolBar_SetToolSeparation, 1 },
+        { "wxToolBar_SetToolPacking", _wrap_wxToolBar_SetToolPacking, 1 },
+        { "wxToolBar_SetMargins", _wrap_wxToolBar_SetMargins, 1 },
+        { "wxToolBar_SetToolShortHelp", _wrap_wxToolBar_SetToolShortHelp, 1 },
+        { "wxToolBar_SetToolLongHelp", _wrap_wxToolBar_SetToolLongHelp, 1 },
+        { "wxToolBar_Realize", _wrap_wxToolBar_Realize, 1 },
+        { "wxToolBar_GetToolState", _wrap_wxToolBar_GetToolState, 1 },
+        { "wxToolBar_GetToolShortHelp", _wrap_wxToolBar_GetToolShortHelp, 1 },
+        { "wxToolBar_GetToolSeparation", _wrap_wxToolBar_GetToolSeparation, 1 },
+        { "wxToolBar_GetToolPacking", _wrap_wxToolBar_GetToolPacking, 1 },
+        { "wxToolBar_GetToolLongHelp", _wrap_wxToolBar_GetToolLongHelp, 1 },
+        { "wxToolBar_GetToolEnabled", _wrap_wxToolBar_GetToolEnabled, 1 },
+        { "wxToolBar_GetMaxSize", _wrap_wxToolBar_GetMaxSize, 1 },
+        { "wxToolBar_SetToolBitmapSize", _wrap_wxToolBar_SetToolBitmapSize, 1 },
+        { "wxToolBar_GetToolBitmapSize", _wrap_wxToolBar_GetToolBitmapSize, 1 },
+        { "wxToolBar_GetToolSize", _wrap_wxToolBar_GetToolSize, 1 },
+        { "wxToolBar_FindToolForPosition", _wrap_wxToolBar_FindToolForPosition, 1 },
+        { "wxToolBar_EnableTool", _wrap_wxToolBar_EnableTool, 1 },
+        { "wxToolBar_AddSimpleTool", _wrap_wxToolBar_AddSimpleTool, 1 },
+        { "wxToolBar_AddTool", _wrap_wxToolBar_AddTool, 1 },
+        { "wxToolBar_AddSeparator", _wrap_wxToolBar_AddSeparator, 1 },

         { "new_wxToolBar", _wrap_new_wxToolBar, 1 },
         { "new_wxToolBar", _wrap_new_wxToolBar, 1 },

-        { "wxToolBarBase_ToggleTool", _wrap_wxToolBarBase_ToggleTool, 1 },
-        { "wxToolBarBase_SetToolSeparation", _wrap_wxToolBarBase_SetToolSeparation, 1 },
-        { "wxToolBarBase_SetToolShortHelp", _wrap_wxToolBarBase_SetToolShortHelp, 1 },
-        { "wxToolBarBase_SetToolPacking", _wrap_wxToolBarBase_SetToolPacking, 1 },
-        { "wxToolBarBase_SetToolLongHelp", _wrap_wxToolBarBase_SetToolLongHelp, 1 },
-        { "wxToolBarBase_SetMargins", _wrap_wxToolBarBase_SetMargins, 1 },
-        { "wxToolBarBase_SetToolBitmapSize", _wrap_wxToolBarBase_SetToolBitmapSize, 1 },
-        { "wxToolBarBase_Realize", _wrap_wxToolBarBase_Realize, 1 },
-        { "wxToolBarBase_GetToolState", _wrap_wxToolBarBase_GetToolState, 1 },
-        { "wxToolBarBase_GetToolShortHelp", _wrap_wxToolBarBase_GetToolShortHelp, 1 },
-        { "wxToolBarBase_GetToolSeparation", _wrap_wxToolBarBase_GetToolSeparation, 1 },
-        { "wxToolBarBase_GetToolPacking", _wrap_wxToolBarBase_GetToolPacking, 1 },
-        { "wxToolBarBase_GetToolLongHelp", _wrap_wxToolBarBase_GetToolLongHelp, 1 },
-        { "wxToolBarBase_GetToolEnabled", _wrap_wxToolBarBase_GetToolEnabled, 1 },
-        { "wxToolBarBase_GetMaxSize", _wrap_wxToolBarBase_GetMaxSize, 1 },
-        { "wxToolBarBase_GetToolBitmapSize", _wrap_wxToolBarBase_GetToolBitmapSize, 1 },
-        { "wxToolBarBase_GetToolSize", _wrap_wxToolBarBase_GetToolSize, 1 },
-        { "wxToolBarBase_FindToolForPosition", _wrap_wxToolBarBase_FindToolForPosition, 1 },
-        { "wxToolBarBase_EnableTool", _wrap_wxToolBarBase_EnableTool, 1 },
-        { "wxToolBarBase_AddTool", _wrap_wxToolBarBase_AddTool, 1 },
-        { "wxToolBarBase_AddSeparator", _wrap_wxToolBarBase_AddSeparator, 1 },

         { "wxToolBarTool_m_longHelpString_get", _wrap_wxToolBarTool_m_longHelpString_get, 1 },
         { "wxToolBarTool_m_longHelpString_get", _wrap_wxToolBarTool_m_longHelpString_get, 1 },

+        { "wxToolBarTool_m_longHelpString_set", _wrap_wxToolBarTool_m_longHelpString_set, 1 },

         { "wxToolBarTool_m_shortHelpString_get", _wrap_wxToolBarTool_m_shortHelpString_get, 1 },
         { "wxToolBarTool_m_shortHelpString_get", _wrap_wxToolBarTool_m_shortHelpString_get, 1 },

+        { "wxToolBarTool_m_shortHelpString_set", _wrap_wxToolBarTool_m_shortHelpString_set, 1 },

         { "wxToolBarTool_m_isMenuCommand_get", _wrap_wxToolBarTool_m_isMenuCommand_get, 1 },
         { "wxToolBarTool_m_isMenuCommand_get", _wrap_wxToolBarTool_m_isMenuCommand_get, 1 },

+        { "wxToolBarTool_m_isMenuCommand_set", _wrap_wxToolBarTool_m_isMenuCommand_set, 1 },

         { "wxToolBarTool_m_bitmap2_get", _wrap_wxToolBarTool_m_bitmap2_get, 1 },
         { "wxToolBarTool_m_bitmap2_get", _wrap_wxToolBarTool_m_bitmap2_get, 1 },

+        { "wxToolBarTool_m_bitmap2_set", _wrap_wxToolBarTool_m_bitmap2_set, 1 },

         { "wxToolBarTool_m_bitmap1_get", _wrap_wxToolBarTool_m_bitmap1_get, 1 },
         { "wxToolBarTool_m_bitmap1_get", _wrap_wxToolBarTool_m_bitmap1_get, 1 },

+        { "wxToolBarTool_m_bitmap1_set", _wrap_wxToolBarTool_m_bitmap1_set, 1 },

         { "wxToolBarTool_m_enabled_get", _wrap_wxToolBarTool_m_enabled_get, 1 },
         { "wxToolBarTool_m_enabled_get", _wrap_wxToolBarTool_m_enabled_get, 1 },

+        { "wxToolBarTool_m_enabled_set", _wrap_wxToolBarTool_m_enabled_set, 1 },

         { "wxToolBarTool_m_deleteSecondBitmap_get", _wrap_wxToolBarTool_m_deleteSecondBitmap_get, 1 },
         { "wxToolBarTool_m_deleteSecondBitmap_get", _wrap_wxToolBarTool_m_deleteSecondBitmap_get, 1 },

+        { "wxToolBarTool_m_deleteSecondBitmap_set", _wrap_wxToolBarTool_m_deleteSecondBitmap_set, 1 },

         { "wxToolBarTool_m_isToggle_get", _wrap_wxToolBarTool_m_isToggle_get, 1 },
         { "wxToolBarTool_m_isToggle_get", _wrap_wxToolBarTool_m_isToggle_get, 1 },

+        { "wxToolBarTool_m_isToggle_set", _wrap_wxToolBarTool_m_isToggle_set, 1 },

         { "wxToolBarTool_m_toggleState_get", _wrap_wxToolBarTool_m_toggleState_get, 1 },
         { "wxToolBarTool_m_toggleState_get", _wrap_wxToolBarTool_m_toggleState_get, 1 },

+        { "wxToolBarTool_m_toggleState_set", _wrap_wxToolBarTool_m_toggleState_set, 1 },

         { "wxToolBarTool_m_height_get", _wrap_wxToolBarTool_m_height_get, 1 },
         { "wxToolBarTool_m_height_get", _wrap_wxToolBarTool_m_height_get, 1 },

+        { "wxToolBarTool_m_height_set", _wrap_wxToolBarTool_m_height_set, 1 },

         { "wxToolBarTool_m_width_get", _wrap_wxToolBarTool_m_width_get, 1 },
         { "wxToolBarTool_m_width_get", _wrap_wxToolBarTool_m_width_get, 1 },

+        { "wxToolBarTool_m_width_set", _wrap_wxToolBarTool_m_width_set, 1 },

         { "wxToolBarTool_m_y_get", _wrap_wxToolBarTool_m_y_get, 1 },
         { "wxToolBarTool_m_y_get", _wrap_wxToolBarTool_m_y_get, 1 },

+        { "wxToolBarTool_m_y_set", _wrap_wxToolBarTool_m_y_set, 1 },

         { "wxToolBarTool_m_x_get", _wrap_wxToolBarTool_m_x_get, 1 },
         { "wxToolBarTool_m_x_get", _wrap_wxToolBarTool_m_x_get, 1 },

+        { "wxToolBarTool_m_x_set", _wrap_wxToolBarTool_m_x_set, 1 },

         { "wxToolBarTool_m_index_get", _wrap_wxToolBarTool_m_index_get, 1 },
         { "wxToolBarTool_m_index_get", _wrap_wxToolBarTool_m_index_get, 1 },

+        { "wxToolBarTool_m_index_set", _wrap_wxToolBarTool_m_index_set, 1 },

         { "wxToolBarTool_m_clientData_get", _wrap_wxToolBarTool_m_clientData_get, 1 },
         { "wxToolBarTool_m_clientData_get", _wrap_wxToolBarTool_m_clientData_get, 1 },

+        { "wxToolBarTool_m_clientData_set", _wrap_wxToolBarTool_m_clientData_set, 1 },

         { "wxToolBarTool_m_toolStyle_get", _wrap_wxToolBarTool_m_toolStyle_get, 1 },
         { "wxToolBarTool_m_toolStyle_get", _wrap_wxToolBarTool_m_toolStyle_get, 1 },

+        { "wxToolBarTool_m_toolStyle_set", _wrap_wxToolBarTool_m_toolStyle_set, 1 },

         { "wxToolBarTool_GetHeight", _wrap_wxToolBarTool_GetHeight, 1 },
         { "wxToolBarTool_GetWidth", _wrap_wxToolBarTool_GetWidth, 1 },
         { "wxToolBarTool_SetSize", _wrap_wxToolBarTool_SetSize, 1 },
         { "wxToolBarTool_GetHeight", _wrap_wxToolBarTool_GetHeight, 1 },
         { "wxToolBarTool_GetWidth", _wrap_wxToolBarTool_GetWidth, 1 },
         { "wxToolBarTool_SetSize", _wrap_wxToolBarTool_SetSize, 1 },


@@ -1692,24 +2367,25 @@ SWIGEXPORT(void,initstattoolc)() {
         SWIG_RegisterMapping("_class_wxActivateEvent","_wxActivateEvent",0);
         SWIG_RegisterMapping("_signed_long","_long",0);
         SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0);
         SWIG_RegisterMapping("_class_wxActivateEvent","_wxActivateEvent",0);
         SWIG_RegisterMapping("_signed_long","_long",0);
         SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",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_wxMenuBar","_wxMenuBar",0);

-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxToolBarSimple",SwigwxToolBarSimpleTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxToolBarSimple",SwigwxToolBarSimpleTowxEvtHandler);

         SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxToolBar",SwigwxToolBarTowxEvtHandler);
         SWIG_RegisterMapping("_class_wxEvtHandler","_wxToolBar",SwigwxToolBarTowxEvtHandler);
         SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxToolBar",SwigwxToolBarTowxEvtHandler);
         SWIG_RegisterMapping("_class_wxEvtHandler","_wxToolBar",SwigwxToolBarTowxEvtHandler);

-        SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxToolBarBase",SwigwxToolBarBaseTowxEvtHandler);
-        SWIG_RegisterMapping("_class_wxEvtHandler","_wxToolBarBase",SwigwxToolBarBaseTowxEvtHandler);

         SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxStatusBar",SwigwxStatusBarTowxEvtHandler);
         SWIG_RegisterMapping("_class_wxEvtHandler","_wxStatusBar",SwigwxStatusBarTowxEvtHandler);
         SWIG_RegisterMapping("_class_wxEvtHandler","_wxEvtHandler",0);
         SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
         SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
         SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
         SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxStatusBar",SwigwxStatusBarTowxEvtHandler);
         SWIG_RegisterMapping("_class_wxEvtHandler","_wxStatusBar",SwigwxStatusBarTowxEvtHandler);
         SWIG_RegisterMapping("_class_wxEvtHandler","_wxEvtHandler",0);
         SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
         SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
         SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);

-        SWIG_RegisterMapping("_class_wxToolBarBase","_class_wxToolBarSimple",SwigwxToolBarSimpleTowxToolBarBase);
-        SWIG_RegisterMapping("_class_wxToolBarBase","_wxToolBarSimple",SwigwxToolBarSimpleTowxToolBarBase);
-        SWIG_RegisterMapping("_class_wxToolBarBase","_class_wxToolBar",SwigwxToolBarTowxToolBarBase);
-        SWIG_RegisterMapping("_class_wxToolBarBase","_wxToolBar",SwigwxToolBarTowxToolBarBase);
-        SWIG_RegisterMapping("_class_wxToolBarBase","_wxToolBarBase",0);
+        SWIG_RegisterMapping("_wxNotifyEvent","_class_wxNotifyEvent",0);
+        SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0);

         SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
         SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
         SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
         SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
         SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
         SWIG_RegisterMapping("_wxPen","_class_wxPen",0);


@@ -1721,22 +2397,30 @@ SWIGEXPORT(void,initstattoolc)() {
         SWIG_RegisterMapping("_long","_wxDash",0);
         SWIG_RegisterMapping("_long","_unsigned_long",0);
         SWIG_RegisterMapping("_long","_signed_long",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("_wxDropFilesEvent","_class_wxDropFilesEvent",0);
         SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0);
         SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
         SWIG_RegisterMapping("_class_wxGauge","_wxGauge",0);
         SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
         SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0);
         SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0);
         SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
         SWIG_RegisterMapping("_class_wxGauge","_wxGauge",0);
         SWIG_RegisterMapping("_wxDC","_class_wxDC",0);

+        SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",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("_class_wxPaintEvent","_wxPaintEvent",0);
         SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0);
         SWIG_RegisterMapping("_class_wxStatusBar","_wxStatusBar",0);
         SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
         SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0);
         SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0);
         SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0);
         SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0);
         SWIG_RegisterMapping("_class_wxStatusBar","_wxStatusBar",0);

-        SWIG_RegisterMapping("_class_wxPostScriptDC","_wxPostScriptDC",0);

         SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);
         SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
         SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
         SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);
         SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
         SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);

+        SWIG_RegisterMapping("_wxPyEvent","_class_wxPyEvent",0);

         SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0);
         SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0);

+        SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0);

         SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
         SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0);
         SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
         SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
         SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0);
         SWIG_RegisterMapping("_wxColour","_class_wxColour",0);


@@ -1746,6 +2430,8 @@ SWIGEXPORT(void,initstattoolc)() {
         SWIG_RegisterMapping("_wxToolBar","_class_wxToolBar",0);
         SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
         SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0);
         SWIG_RegisterMapping("_wxToolBar","_class_wxToolBar",0);
         SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
         SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",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("_uint","_unsigned_int",0);
         SWIG_RegisterMapping("_uint","_int",0);
         SWIG_RegisterMapping("_uint","_wxWindowID",0);


@@ -1759,18 +2445,22 @@ SWIGEXPORT(void,initstattoolc)() {
         SWIG_RegisterMapping("_wxRadioBox","_class_wxRadioBox",0);
         SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
         SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);
         SWIG_RegisterMapping("_wxRadioBox","_class_wxRadioBox",0);
         SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
         SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0);

+        SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0);

         SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0);
         SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0);
         SWIG_RegisterMapping("_wxToolBarTool","_class_wxToolBarTool",0);
         SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
         SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0);
         SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0);
         SWIG_RegisterMapping("_wxToolBarTool","_class_wxToolBarTool",0);
         SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);

+        SWIG_RegisterMapping("_class_wxNotifyEvent","_wxNotifyEvent",0);
+        SWIG_RegisterMapping("_class_wxPyEvent","_wxPyEvent",0);

         SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
         SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);
         SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
         SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);

-        SWIG_RegisterMapping("_wxToolBarSimple","_class_wxToolBarSimple",0);

         SWIG_RegisterMapping("_class_wxToolBar","_wxToolBar",0);
         SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0);
         SWIG_RegisterMapping("_class_wxToolBar","_wxToolBar",0);
         SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0);

+        SWIG_RegisterMapping("_EBool","_wxPrintQuality",0);

         SWIG_RegisterMapping("_EBool","_signed_int",0);
         SWIG_RegisterMapping("_EBool","_int",0);
         SWIG_RegisterMapping("_EBool","_wxWindowID",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("_class_wxDropFilesEvent","_wxDropFilesEvent",0);
         SWIG_RegisterMapping("_wxStaticText","_class_wxStaticText",0);
         SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
         SWIG_RegisterMapping("_class_wxDropFilesEvent","_wxDropFilesEvent",0);
         SWIG_RegisterMapping("_wxStaticText","_class_wxStaticText",0);
         SWIG_RegisterMapping("_wxFont","_class_wxFont",0);


@@ -1788,6 +2478,7 @@ SWIGEXPORT(void,initstattoolc)() {
         SWIG_RegisterMapping("_class_wxCheckBox","_wxCheckBox",0);
         SWIG_RegisterMapping("_wxComboBox","_class_wxComboBox",0);
         SWIG_RegisterMapping("_wxRadioButton","_class_wxRadioButton",0);
         SWIG_RegisterMapping("_class_wxCheckBox","_wxCheckBox",0);
         SWIG_RegisterMapping("_wxComboBox","_class_wxComboBox",0);
         SWIG_RegisterMapping("_wxRadioButton","_class_wxRadioButton",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("_signed_int","_EBool",0);
         SWIG_RegisterMapping("_signed_int","_wxWindowID",0);
         SWIG_RegisterMapping("_signed_int","_int",0);


@@ -1798,19 +2489,14 @@ SWIGEXPORT(void,initstattoolc)() {
         SWIG_RegisterMapping("_class_wxMoveEvent","_wxMoveEvent",0);
         SWIG_RegisterMapping("_wxListBox","_class_wxListBox",0);
         SWIG_RegisterMapping("_wxScreenDC","_class_wxScreenDC",0);
         SWIG_RegisterMapping("_class_wxMoveEvent","_wxMoveEvent",0);
         SWIG_RegisterMapping("_wxListBox","_class_wxListBox",0);
         SWIG_RegisterMapping("_wxScreenDC","_class_wxScreenDC",0);

-        SWIG_RegisterMapping("_class_wxToolBarSimple","_wxToolBarSimple",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("_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","_class_wxToolBarSimple",SwigwxToolBarSimpleTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxToolBarSimple",SwigwxToolBarSimpleTowxWindow);

         SWIG_RegisterMapping("_class_wxWindow","_class_wxToolBar",SwigwxToolBarTowxWindow);
         SWIG_RegisterMapping("_class_wxWindow","_wxToolBar",SwigwxToolBarTowxWindow);
         SWIG_RegisterMapping("_class_wxWindow","_class_wxToolBar",SwigwxToolBarTowxWindow);
         SWIG_RegisterMapping("_class_wxWindow","_wxToolBar",SwigwxToolBarTowxWindow);

-        SWIG_RegisterMapping("_class_wxWindow","_class_wxToolBarBase",SwigwxToolBarBaseTowxWindow);
-        SWIG_RegisterMapping("_class_wxWindow","_wxToolBarBase",SwigwxToolBarBaseTowxWindow);

         SWIG_RegisterMapping("_class_wxWindow","_class_wxStatusBar",SwigwxStatusBarTowxWindow);
         SWIG_RegisterMapping("_class_wxWindow","_wxStatusBar",SwigwxStatusBarTowxWindow);
         SWIG_RegisterMapping("_class_wxWindow","_wxWindow",0);
         SWIG_RegisterMapping("_class_wxWindow","_class_wxStatusBar",SwigwxStatusBarTowxWindow);
         SWIG_RegisterMapping("_class_wxWindow","_wxStatusBar",SwigwxStatusBarTowxWindow);
         SWIG_RegisterMapping("_class_wxWindow","_wxWindow",0);


@@ -1827,25 +2513,23 @@ SWIGEXPORT(void,initstattoolc)() {
         SWIG_RegisterMapping("_signed_short","_short",0);
         SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0);
         SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",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_wxFocusEvent","_wxFocusEvent",0);
         SWIG_RegisterMapping("_class_wxMaximizeEvent","_wxMaximizeEvent",0);
         SWIG_RegisterMapping("_wxStatusBar","_class_wxStatusBar",0);
         SWIG_RegisterMapping("_class_wxToolBarTool","_wxToolBarTool",0);
         SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
         SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);
         SWIG_RegisterMapping("_class_wxFocusEvent","_wxFocusEvent",0);
         SWIG_RegisterMapping("_class_wxMaximizeEvent","_wxMaximizeEvent",0);
         SWIG_RegisterMapping("_wxStatusBar","_class_wxStatusBar",0);
         SWIG_RegisterMapping("_class_wxToolBarTool","_wxToolBarTool",0);
         SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
         SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);

-        SWIG_RegisterMapping("_wxPostScriptDC","_class_wxPostScriptDC",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("_wxScrolledWindow","_class_wxScrolledWindow",0);
         SWIG_RegisterMapping("_unsigned_char","_byte",0);
         SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0);
         SWIG_RegisterMapping("_class_wxMenu","_wxMenu",0);

-        SWIG_RegisterMapping("_wxControl","_class_wxToolBarSimple",SwigwxToolBarSimpleTowxControl);
-        SWIG_RegisterMapping("_wxControl","_wxToolBarSimple",SwigwxToolBarSimpleTowxControl);

         SWIG_RegisterMapping("_wxControl","_class_wxToolBar",SwigwxToolBarTowxControl);
         SWIG_RegisterMapping("_wxControl","_wxToolBar",SwigwxToolBarTowxControl);
         SWIG_RegisterMapping("_wxControl","_class_wxToolBar",SwigwxToolBarTowxControl);
         SWIG_RegisterMapping("_wxControl","_wxToolBar",SwigwxToolBarTowxControl);

-        SWIG_RegisterMapping("_wxControl","_class_wxToolBarBase",SwigwxToolBarBaseTowxControl);
-        SWIG_RegisterMapping("_wxControl","_wxToolBarBase",SwigwxToolBarBaseTowxControl);

         SWIG_RegisterMapping("_wxControl","_class_wxControl",0);
         SWIG_RegisterMapping("_class_wxListBox","_wxListBox",0);
         SWIG_RegisterMapping("_wxControl","_class_wxControl",0);
         SWIG_RegisterMapping("_class_wxListBox","_wxListBox",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("_unsigned_int","_uint",0);
         SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0);
         SWIG_RegisterMapping("_unsigned_int","_int",0);


@@ -1861,47 +2545,47 @@ SWIGEXPORT(void,initstattoolc)() {
         SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0);
         SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
         SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);
         SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0);
         SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
         SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);

+        SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0);

         SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
         SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",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("_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("_class_wxMouseEvent","_wxMouseEvent",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("_class_wxMouseEvent","_wxMouseEvent",0);

+        SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0);

         SWIG_RegisterMapping("_wxButton","_class_wxButton",0);
         SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
         SWIG_RegisterMapping("_wxButton","_class_wxButton",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_wxSysColourChangedEvent","_wxSysColourChangedEvent",0);
         SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0);
         SWIG_RegisterMapping("_class_wxComboBox","_wxComboBox",0);
         SWIG_RegisterMapping("_class_wxRadioButton","_wxRadioButton",0);
         SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0);
         SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
         SWIG_RegisterMapping("_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0);
         SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0);
         SWIG_RegisterMapping("_class_wxComboBox","_wxComboBox",0);
         SWIG_RegisterMapping("_class_wxRadioButton","_wxRadioButton",0);

-        SWIG_RegisterMapping("_wxToolBarBase","_class_wxToolBarSimple",SwigwxToolBarSimpleTowxToolBarBase);
-        SWIG_RegisterMapping("_wxToolBarBase","_wxToolBarSimple",SwigwxToolBarSimpleTowxToolBarBase);
-        SWIG_RegisterMapping("_wxToolBarBase","_class_wxToolBar",SwigwxToolBarTowxToolBarBase);
-        SWIG_RegisterMapping("_wxToolBarBase","_wxToolBar",SwigwxToolBarTowxToolBarBase);
-        SWIG_RegisterMapping("_wxToolBarBase","_class_wxToolBarBase",0);

         SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
         SWIG_RegisterMapping("_wxIconizeEvent","_class_wxIconizeEvent",0);
         SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
         SWIG_RegisterMapping("_wxIconizeEvent","_class_wxIconizeEvent",0);

-        SWIG_RegisterMapping("_class_wxControl","_class_wxToolBarSimple",SwigwxToolBarSimpleTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_wxToolBarSimple",SwigwxToolBarSimpleTowxControl);

         SWIG_RegisterMapping("_class_wxControl","_class_wxToolBar",SwigwxToolBarTowxControl);
         SWIG_RegisterMapping("_class_wxControl","_wxToolBar",SwigwxToolBarTowxControl);
         SWIG_RegisterMapping("_class_wxControl","_class_wxToolBar",SwigwxToolBarTowxControl);
         SWIG_RegisterMapping("_class_wxControl","_wxToolBar",SwigwxToolBarTowxControl);

-        SWIG_RegisterMapping("_class_wxControl","_class_wxToolBarBase",SwigwxToolBarBaseTowxControl);
-        SWIG_RegisterMapping("_class_wxControl","_wxToolBarBase",SwigwxToolBarBaseTowxControl);

         SWIG_RegisterMapping("_class_wxControl","_wxControl",0);
         SWIG_RegisterMapping("_wxStaticBitmap","_class_wxStaticBitmap",0);
         SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0);
         SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
         SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
         SWIG_RegisterMapping("_class_wxControl","_wxControl",0);
         SWIG_RegisterMapping("_wxStaticBitmap","_class_wxStaticBitmap",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("_class_wxIdleEvent","_wxIdleEvent",0);
         SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
         SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
         SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0);
         SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
         SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);

+        SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);

         SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
         SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
         SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0);
         SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
         SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
         SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0);


@@ -1913,12 +2597,8 @@ SWIGEXPORT(void,initstattoolc)() {
         SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0);
         SWIG_RegisterMapping("_class_wxMemoryDC","_wxMemoryDC",0);
         SWIG_RegisterMapping("_wxMenuBar","_class_wxMenuBar",0);
         SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0);
         SWIG_RegisterMapping("_class_wxMemoryDC","_wxMemoryDC",0);
         SWIG_RegisterMapping("_wxMenuBar","_class_wxMenuBar",0);

-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxToolBarSimple",SwigwxToolBarSimpleTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxToolBarSimple",SwigwxToolBarSimpleTowxEvtHandler);

         SWIG_RegisterMapping("_wxEvtHandler","_class_wxToolBar",SwigwxToolBarTowxEvtHandler);
         SWIG_RegisterMapping("_wxEvtHandler","_wxToolBar",SwigwxToolBarTowxEvtHandler);
         SWIG_RegisterMapping("_wxEvtHandler","_class_wxToolBar",SwigwxToolBarTowxEvtHandler);
         SWIG_RegisterMapping("_wxEvtHandler","_wxToolBar",SwigwxToolBarTowxEvtHandler);

-        SWIG_RegisterMapping("_wxEvtHandler","_class_wxToolBarBase",SwigwxToolBarBaseTowxEvtHandler);
-        SWIG_RegisterMapping("_wxEvtHandler","_wxToolBarBase",SwigwxToolBarBaseTowxEvtHandler);

         SWIG_RegisterMapping("_wxEvtHandler","_class_wxStatusBar",SwigwxStatusBarTowxEvtHandler);
         SWIG_RegisterMapping("_wxEvtHandler","_wxStatusBar",SwigwxStatusBarTowxEvtHandler);
         SWIG_RegisterMapping("_wxEvtHandler","_class_wxEvtHandler",0);
         SWIG_RegisterMapping("_wxEvtHandler","_class_wxStatusBar",SwigwxStatusBarTowxEvtHandler);
         SWIG_RegisterMapping("_wxEvtHandler","_wxStatusBar",SwigwxStatusBarTowxEvtHandler);
         SWIG_RegisterMapping("_wxEvtHandler","_class_wxEvtHandler",0);


@@ -1929,13 +2609,10 @@ SWIGEXPORT(void,initstattoolc)() {
         SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
         SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0);
         SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0);
         SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
         SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0);
         SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0);

+        SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0);

         SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0);
         SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0);

-        SWIG_RegisterMapping("_wxWindow","_class_wxToolBarSimple",SwigwxToolBarSimpleTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxToolBarSimple",SwigwxToolBarSimpleTowxWindow);

         SWIG_RegisterMapping("_wxWindow","_class_wxToolBar",SwigwxToolBarTowxWindow);
         SWIG_RegisterMapping("_wxWindow","_wxToolBar",SwigwxToolBarTowxWindow);
         SWIG_RegisterMapping("_wxWindow","_class_wxToolBar",SwigwxToolBarTowxWindow);
         SWIG_RegisterMapping("_wxWindow","_wxToolBar",SwigwxToolBarTowxWindow);

-        SWIG_RegisterMapping("_wxWindow","_class_wxToolBarBase",SwigwxToolBarBaseTowxWindow);
-        SWIG_RegisterMapping("_wxWindow","_wxToolBarBase",SwigwxToolBarBaseTowxWindow);

         SWIG_RegisterMapping("_wxWindow","_class_wxStatusBar",SwigwxStatusBarTowxWindow);
         SWIG_RegisterMapping("_wxWindow","_wxStatusBar",SwigwxStatusBarTowxWindow);
         SWIG_RegisterMapping("_wxWindow","_class_wxWindow",0);
         SWIG_RegisterMapping("_wxWindow","_class_wxStatusBar",SwigwxStatusBarTowxWindow);
         SWIG_RegisterMapping("_wxWindow","_wxStatusBar",SwigwxStatusBarTowxWindow);
         SWIG_RegisterMapping("_wxWindow","_class_wxWindow",0);