wxPython updates for wxGTK

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

diff --git a/utils/wxPython/src/gtk/stattool.cpp b/utils/wxPython/src/gtk/stattool.cpp
index 0994ba9e4b954501f4a78fc94e4d5fa57f733e0a..1aa582c6b62c413ec9b756fd14bf6788c73f0a9f 100644 (file)
--- a/utils/wxPython/src/gtk/stattool.cpp
+++ b/utils/wxPython/src/gtk/stattool.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)

- * Version 1.1 (Patch 6)
+ * Version 1.1 (Build 810)

  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.


@@ -104,17 +104,6 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     return target;
 }
 
     return target;
 }
 

-
-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 wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
-
-

 static char* wxStringErrorMsg = "string type is required for parameter";
 #ifdef __cplusplus
 extern "C" {
 static char* wxStringErrorMsg = "string type is required for parameter";
 #ifdef __cplusplus
 extern "C" {


@@ -136,7 +125,7 @@ static void *SwigwxStatusBarTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxStatusBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxStatusBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
 }
 
 #define new_wxStatusBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxStatusBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))

-static PyObject *_wrap_new_wxStatusBar(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxStatusBar(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxStatusBar * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxStatusBar * _result;
     wxWindow * _arg0;


@@ -146,12 +135,15 @@ static PyObject *_wrap_new_wxStatusBar(PyObject *self, PyObject *args) {
     long  _arg4 = (long ) wxST_SIZEGRIP;
     char * _arg5 = (char *) "statusBar";
     PyObject * _argo0 = 0;
     long  _arg4 = (long ) wxST_SIZEGRIP;
     char * _arg5 = (char *) "statusBar";
     PyObject * _argo0 = 0;

-    PyObject * _argo2 = 0;
-    PyObject * _argo3 = 0;
+    wxPoint  temp;
+    PyObject * _obj2 = 0;
+    wxSize  temp0;
+    PyObject * _obj3 = 0;
+    char *_kwnames[] = { "parent","id","pos","size","style","name", NULL };

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

-    if(!PyArg_ParseTuple(args,"Oi|OOls:new_wxStatusBar",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxStatusBar",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4,&_arg5)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -160,20 +152,18 @@ static PyObject *_wrap_new_wxStatusBar(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
         return NULL;
         }
     }

-    if (_argo2) {
-        if (_argo2 == Py_None) { _arg2 = NULL; }
-        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxStatusBar. Expected _wxPoint_p.");
+    if (_obj2)
+{
+    _arg2 = &temp;
+    if (! wxPoint_helper(_obj2, &_arg2))

         return NULL;
         return NULL;

-        }
-    }
-    if (_argo3) {
-        if (_argo3 == Py_None) { _arg3 = NULL; }
-        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxStatusBar. Expected _wxSize_p.");
+}
+    if (_obj3)
+{
+    _arg3 = &temp0;
+    if (! wxSize_helper(_obj3, &_arg3))

         return NULL;
         return NULL;

-        }
-    }
+}

 {
     wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxStatusBar *)new_wxStatusBar(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
 {
     wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxStatusBar *)new_wxStatusBar(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);


@@ -194,16 +184,17 @@ static wxRect * wxStatusBar_GetFieldRect(wxStatusBar *self,long  item) {
             self->GetFieldRect(item, *rect);
             return rect;
         }
             self->GetFieldRect(item, *rect);
             return rect;
         }

-static PyObject *_wrap_wxStatusBar_GetFieldRect(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxStatusBar_GetFieldRect(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxRect * _result;
     wxStatusBar * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
     PyObject * _resultobj;
     wxRect * _result;
     wxStatusBar * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;

+    char *_kwnames[] = { "self","item", NULL };

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

-    if(!PyArg_ParseTuple(args,"Ol:wxStatusBar_GetFieldRect",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxStatusBar_GetFieldRect",_kwnames,&_argo0,&_arg1)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -228,14 +219,15 @@ static PyObject *_wrap_wxStatusBar_GetFieldRect(PyObject *self, PyObject *args)
 }
 
 #define wxStatusBar_GetFieldsCount(_swigobj)  (_swigobj->GetFieldsCount())
 }
 
 #define wxStatusBar_GetFieldsCount(_swigobj)  (_swigobj->GetFieldsCount())

-static PyObject *_wrap_wxStatusBar_GetFieldsCount(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxStatusBar_GetFieldsCount(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     int  _result;
     wxStatusBar * _arg0;
     PyObject * _argo0 = 0;
     PyObject * _resultobj;
     int  _result;
     wxStatusBar * _arg0;
     PyObject * _argo0 = 0;

+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"O:wxStatusBar_GetFieldsCount",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxStatusBar_GetFieldsCount",_kwnames,&_argo0)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -254,15 +246,16 @@ static PyObject *_wrap_wxStatusBar_GetFieldsCount(PyObject *self, PyObject *args
 }
 
 #define wxStatusBar_GetStatusText(_swigobj,_swigarg0)  (_swigobj->GetStatusText(_swigarg0))
 }
 
 #define wxStatusBar_GetStatusText(_swigobj,_swigarg0)  (_swigobj->GetStatusText(_swigarg0))

-static PyObject *_wrap_wxStatusBar_GetStatusText(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxStatusBar_GetStatusText(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxString * _result;
     wxStatusBar * _arg0;
     int  _arg1 = (int ) 0;
     PyObject * _argo0 = 0;
     PyObject * _resultobj;
     wxString * _result;
     wxStatusBar * _arg0;
     int  _arg1 = (int ) 0;
     PyObject * _argo0 = 0;

+    char *_kwnames[] = { "self","ir", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"O|i:wxStatusBar_GetStatusText",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxStatusBar_GetStatusText",_kwnames,&_argo0,&_arg1)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -286,16 +279,17 @@ static PyObject *_wrap_wxStatusBar_GetStatusText(PyObject *self, PyObject *args)
 }
 
 #define wxStatusBar_DrawField(_swigobj,_swigarg0,_swigarg1)  (_swigobj->DrawField(_swigarg0,_swigarg1))
 }
 
 #define wxStatusBar_DrawField(_swigobj,_swigarg0,_swigarg1)  (_swigobj->DrawField(_swigarg0,_swigarg1))

-static PyObject *_wrap_wxStatusBar_DrawField(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxStatusBar_DrawField(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxStatusBar * _arg0;
     wxDC * _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
     PyObject * _resultobj;
     wxStatusBar * _arg0;
     wxDC * _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;

+    char *_kwnames[] = { "self","dc","i", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"OOi:wxStatusBar_DrawField",&_argo0,&_argo1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOi:wxStatusBar_DrawField",_kwnames,&_argo0,&_argo1,&_arg2)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -322,16 +316,17 @@ static PyObject *_wrap_wxStatusBar_DrawField(PyObject *self, PyObject *args) {
 }
 
 #define wxStatusBar_DrawFieldText(_swigobj,_swigarg0,_swigarg1)  (_swigobj->DrawFieldText(_swigarg0,_swigarg1))
 }
 
 #define wxStatusBar_DrawFieldText(_swigobj,_swigarg0,_swigarg1)  (_swigobj->DrawFieldText(_swigarg0,_swigarg1))

-static PyObject *_wrap_wxStatusBar_DrawFieldText(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxStatusBar_DrawFieldText(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxStatusBar * _arg0;
     wxDC * _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
     PyObject * _resultobj;
     wxStatusBar * _arg0;
     wxDC * _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;

+    char *_kwnames[] = { "self","dc","i", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"OOi:wxStatusBar_DrawFieldText",&_argo0,&_argo1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOi:wxStatusBar_DrawFieldText",_kwnames,&_argo0,&_argo1,&_arg2)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -358,13 +353,14 @@ static PyObject *_wrap_wxStatusBar_DrawFieldText(PyObject *self, PyObject *args)
 }
 
 #define wxStatusBar_InitColours(_swigobj)  (_swigobj->InitColours())
 }
 
 #define wxStatusBar_InitColours(_swigobj)  (_swigobj->InitColours())

-static PyObject *_wrap_wxStatusBar_InitColours(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxStatusBar_InitColours(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxStatusBar * _arg0;
     PyObject * _argo0 = 0;
     PyObject * _resultobj;
     wxStatusBar * _arg0;
     PyObject * _argo0 = 0;

+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"O:wxStatusBar_InitColours",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxStatusBar_InitColours",_kwnames,&_argo0)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -384,14 +380,15 @@ static PyObject *_wrap_wxStatusBar_InitColours(PyObject *self, PyObject *args) {
 }
 
 #define wxStatusBar_SetFieldsCount(_swigobj,_swigarg0)  (_swigobj->SetFieldsCount(_swigarg0))
 }
 
 #define wxStatusBar_SetFieldsCount(_swigobj,_swigarg0)  (_swigobj->SetFieldsCount(_swigarg0))

-static PyObject *_wrap_wxStatusBar_SetFieldsCount(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxStatusBar_SetFieldsCount(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxStatusBar * _arg0;
     int  _arg1 = (int ) 1;
     PyObject * _argo0 = 0;
     PyObject * _resultobj;
     wxStatusBar * _arg0;
     int  _arg1 = (int ) 1;
     PyObject * _argo0 = 0;

+    char *_kwnames[] = { "self","number", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"O|i:wxStatusBar_SetFieldsCount",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxStatusBar_SetFieldsCount",_kwnames,&_argo0,&_arg1)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -411,16 +408,17 @@ static PyObject *_wrap_wxStatusBar_SetFieldsCount(PyObject *self, PyObject *args
 }
 
 #define wxStatusBar_SetStatusText(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetStatusText(_swigarg0,_swigarg1))
 }
 
 #define wxStatusBar_SetStatusText(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetStatusText(_swigarg0,_swigarg1))

-static PyObject *_wrap_wxStatusBar_SetStatusText(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxStatusBar_SetStatusText(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxStatusBar * _arg0;
     wxString * _arg1;
     int  _arg2 = (int ) 0;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _resultobj;
     wxStatusBar * _arg0;
     wxString * _arg1;
     int  _arg2 = (int ) 0;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;

+    char *_kwnames[] = { "self","text","i", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"OO|i:wxStatusBar_SetStatusText",&_argo0,&_obj1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|i:wxStatusBar_SetStatusText",_kwnames,&_argo0,&_obj1,&_arg2)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -451,16 +449,17 @@ static PyObject *_wrap_wxStatusBar_SetStatusText(PyObject *self, PyObject *args)
 }
 
 #define wxStatusBar_SetStatusWidths(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetStatusWidths(_swigarg0,_swigarg1))
 }
 
 #define wxStatusBar_SetStatusWidths(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetStatusWidths(_swigarg0,_swigarg1))

-static PyObject *_wrap_wxStatusBar_SetStatusWidths(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxStatusBar_SetStatusWidths(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxStatusBar * _arg0;
     int  _arg1;
     int * _arg2;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
     PyObject * _resultobj;
     wxStatusBar * _arg0;
     int  _arg1;
     int * _arg2;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;

+    char *_kwnames[] = { "self","LIST", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"OO:wxStatusBar_SetStatusWidths",&_argo0,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxStatusBar_SetStatusWidths",_kwnames,&_argo0,&_obj2)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -498,13 +497,14 @@ static PyObject *_wrap_wxStatusBar_SetStatusWidths(PyObject *self, PyObject *arg
 }
 
 #define new_wxToolBarTool() (new wxToolBarTool())
 }
 
 #define new_wxToolBarTool() (new wxToolBarTool())

-static PyObject *_wrap_new_wxToolBarTool(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxToolBarTool(PyObject *self, PyObject *args, PyObject *kwargs) {

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

+    char *_kwnames[] = {  NULL };

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

-    if(!PyArg_ParseTuple(args,":new_wxToolBarTool")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxToolBarTool",_kwnames)) 

         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;


@@ -522,13 +522,14 @@ static PyObject *_wrap_new_wxToolBarTool(PyObject *self, PyObject *args) {
 }
 
 #define delete_wxToolBarTool(_swigobj) (delete _swigobj)
 }
 
 #define delete_wxToolBarTool(_swigobj) (delete _swigobj)

-static PyObject *_wrap_delete_wxToolBarTool(PyObject *self, PyObject *args) {
+static PyObject *_wrap_delete_wxToolBarTool(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;
     PyObject * _resultobj;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;

+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"O:delete_wxToolBarTool",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxToolBarTool",_kwnames,&_argo0)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -548,15 +549,16 @@ static PyObject *_wrap_delete_wxToolBarTool(PyObject *self, PyObject *args) {
 }
 
 #define wxToolBarTool_m_toolStyle_set(_swigobj,_swigval) (_swigobj->m_toolStyle = _swigval,_swigval)
 }
 
 #define wxToolBarTool_m_toolStyle_set(_swigobj,_swigval) (_swigobj->m_toolStyle = _swigval,_swigval)

-static PyObject *_wrap_wxToolBarTool_m_toolStyle_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_toolStyle_set(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     int  _result;
     wxToolBarTool * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
     PyObject * _resultobj;
     int  _result;
     wxToolBarTool * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;

+    char *_kwnames[] = { "self","m_toolStyle", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"Oi:wxToolBarTool_m_toolStyle_set",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarTool_m_toolStyle_set",_kwnames,&_argo0,&_arg1)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -575,14 +577,15 @@ static PyObject *_wrap_wxToolBarTool_m_toolStyle_set(PyObject *self, PyObject *a
 }
 
 #define wxToolBarTool_m_toolStyle_get(_swigobj) ((int ) _swigobj->m_toolStyle)
 }
 
 #define wxToolBarTool_m_toolStyle_get(_swigobj) ((int ) _swigobj->m_toolStyle)

-static PyObject *_wrap_wxToolBarTool_m_toolStyle_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_toolStyle_get(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     int  _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;
     PyObject * _resultobj;
     int  _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;

+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_toolStyle_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_toolStyle_get",_kwnames,&_argo0)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -601,17 +604,18 @@ static PyObject *_wrap_wxToolBarTool_m_toolStyle_get(PyObject *self, PyObject *a
 }
 
 #define wxToolBarTool_m_clientData_set(_swigobj,_swigval) (_swigobj->m_clientData = _swigval,_swigval)
 }
 
 #define wxToolBarTool_m_clientData_set(_swigobj,_swigval) (_swigobj->m_clientData = _swigval,_swigval)

-static PyObject *_wrap_wxToolBarTool_m_clientData_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_clientData_set(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxObject * _result;
     wxToolBarTool * _arg0;
     wxObject * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
     PyObject * _resultobj;
     wxObject * _result;
     wxToolBarTool * _arg0;
     wxObject * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;

+    char *_kwnames[] = { "self","m_clientData", NULL };

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

-    if(!PyArg_ParseTuple(args,"OO:wxToolBarTool_m_clientData_set",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxToolBarTool_m_clientData_set",_kwnames,&_argo0,&_argo1)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -643,15 +647,16 @@ static PyObject *_wrap_wxToolBarTool_m_clientData_set(PyObject *self, PyObject *
 }
 
 #define wxToolBarTool_m_clientData_get(_swigobj) ((wxObject *) _swigobj->m_clientData)
 }
 
 #define wxToolBarTool_m_clientData_get(_swigobj) ((wxObject *) _swigobj->m_clientData)

-static PyObject *_wrap_wxToolBarTool_m_clientData_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_clientData_get(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxObject * _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;
     PyObject * _resultobj;
     wxObject * _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;

+    char *_kwnames[] = { "self", NULL };

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

-    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_clientData_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_clientData_get",_kwnames,&_argo0)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -676,15 +681,16 @@ static PyObject *_wrap_wxToolBarTool_m_clientData_get(PyObject *self, PyObject *
 }
 
 #define wxToolBarTool_m_index_set(_swigobj,_swigval) (_swigobj->m_index = _swigval,_swigval)
 }
 
 #define wxToolBarTool_m_index_set(_swigobj,_swigval) (_swigobj->m_index = _swigval,_swigval)

-static PyObject *_wrap_wxToolBarTool_m_index_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_index_set(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     int  _result;
     wxToolBarTool * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
     PyObject * _resultobj;
     int  _result;
     wxToolBarTool * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;

+    char *_kwnames[] = { "self","m_index", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"Oi:wxToolBarTool_m_index_set",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarTool_m_index_set",_kwnames,&_argo0,&_arg1)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -703,14 +709,15 @@ static PyObject *_wrap_wxToolBarTool_m_index_set(PyObject *self, PyObject *args)
 }
 
 #define wxToolBarTool_m_index_get(_swigobj) ((int ) _swigobj->m_index)
 }
 
 #define wxToolBarTool_m_index_get(_swigobj) ((int ) _swigobj->m_index)

-static PyObject *_wrap_wxToolBarTool_m_index_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_index_get(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     int  _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;
     PyObject * _resultobj;
     int  _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;

+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_index_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_index_get",_kwnames,&_argo0)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -729,16 +736,17 @@ static PyObject *_wrap_wxToolBarTool_m_index_get(PyObject *self, PyObject *args)
 }
 
 #define wxToolBarTool_m_toggleState_set(_swigobj,_swigval) (_swigobj->m_toggleState = _swigval,_swigval)
 }
 
 #define wxToolBarTool_m_toggleState_set(_swigobj,_swigval) (_swigobj->m_toggleState = _swigval,_swigval)

-static PyObject *_wrap_wxToolBarTool_m_toggleState_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_toggleState_set(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;

+    char *_kwnames[] = { "self","m_toggleState", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"Oi:wxToolBarTool_m_toggleState_set",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarTool_m_toggleState_set",_kwnames,&_argo0,&tempbool1)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -758,14 +766,15 @@ static PyObject *_wrap_wxToolBarTool_m_toggleState_set(PyObject *self, PyObject
 }
 
 #define wxToolBarTool_m_toggleState_get(_swigobj) ((bool ) _swigobj->m_toggleState)
 }
 
 #define wxToolBarTool_m_toggleState_get(_swigobj) ((bool ) _swigobj->m_toggleState)

-static PyObject *_wrap_wxToolBarTool_m_toggleState_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_toggleState_get(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;
     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;

+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_toggleState_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_toggleState_get",_kwnames,&_argo0)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -784,16 +793,17 @@ static PyObject *_wrap_wxToolBarTool_m_toggleState_get(PyObject *self, PyObject
 }
 
 #define wxToolBarTool_m_isToggle_set(_swigobj,_swigval) (_swigobj->m_isToggle = _swigval,_swigval)
 }
 
 #define wxToolBarTool_m_isToggle_set(_swigobj,_swigval) (_swigobj->m_isToggle = _swigval,_swigval)

-static PyObject *_wrap_wxToolBarTool_m_isToggle_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_isToggle_set(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;

+    char *_kwnames[] = { "self","m_isToggle", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"Oi:wxToolBarTool_m_isToggle_set",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarTool_m_isToggle_set",_kwnames,&_argo0,&tempbool1)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -813,14 +823,15 @@ static PyObject *_wrap_wxToolBarTool_m_isToggle_set(PyObject *self, PyObject *ar
 }
 
 #define wxToolBarTool_m_isToggle_get(_swigobj) ((bool ) _swigobj->m_isToggle)
 }
 
 #define wxToolBarTool_m_isToggle_get(_swigobj) ((bool ) _swigobj->m_isToggle)

-static PyObject *_wrap_wxToolBarTool_m_isToggle_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_isToggle_get(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;
     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;

+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_isToggle_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_isToggle_get",_kwnames,&_argo0)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -839,16 +850,17 @@ static PyObject *_wrap_wxToolBarTool_m_isToggle_get(PyObject *self, PyObject *ar
 }
 
 #define wxToolBarTool_m_deleteSecondBitmap_set(_swigobj,_swigval) (_swigobj->m_deleteSecondBitmap = _swigval,_swigval)
 }
 
 #define wxToolBarTool_m_deleteSecondBitmap_set(_swigobj,_swigval) (_swigobj->m_deleteSecondBitmap = _swigval,_swigval)

-static PyObject *_wrap_wxToolBarTool_m_deleteSecondBitmap_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_deleteSecondBitmap_set(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;

+    char *_kwnames[] = { "self","m_deleteSecondBitmap", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"Oi:wxToolBarTool_m_deleteSecondBitmap_set",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarTool_m_deleteSecondBitmap_set",_kwnames,&_argo0,&tempbool1)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -868,14 +880,15 @@ static PyObject *_wrap_wxToolBarTool_m_deleteSecondBitmap_set(PyObject *self, Py
 }
 
 #define wxToolBarTool_m_deleteSecondBitmap_get(_swigobj) ((bool ) _swigobj->m_deleteSecondBitmap)
 }
 
 #define wxToolBarTool_m_deleteSecondBitmap_get(_swigobj) ((bool ) _swigobj->m_deleteSecondBitmap)

-static PyObject *_wrap_wxToolBarTool_m_deleteSecondBitmap_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_deleteSecondBitmap_get(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;
     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;

+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_deleteSecondBitmap_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_deleteSecondBitmap_get",_kwnames,&_argo0)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -894,16 +907,17 @@ static PyObject *_wrap_wxToolBarTool_m_deleteSecondBitmap_get(PyObject *self, Py
 }
 
 #define wxToolBarTool_m_enabled_set(_swigobj,_swigval) (_swigobj->m_enabled = _swigval,_swigval)
 }
 
 #define wxToolBarTool_m_enabled_set(_swigobj,_swigval) (_swigobj->m_enabled = _swigval,_swigval)

-static PyObject *_wrap_wxToolBarTool_m_enabled_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_enabled_set(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;

+    char *_kwnames[] = { "self","m_enabled", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"Oi:wxToolBarTool_m_enabled_set",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarTool_m_enabled_set",_kwnames,&_argo0,&tempbool1)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -923,14 +937,15 @@ static PyObject *_wrap_wxToolBarTool_m_enabled_set(PyObject *self, PyObject *arg
 }
 
 #define wxToolBarTool_m_enabled_get(_swigobj) ((bool ) _swigobj->m_enabled)
 }
 
 #define wxToolBarTool_m_enabled_get(_swigobj) ((bool ) _swigobj->m_enabled)

-static PyObject *_wrap_wxToolBarTool_m_enabled_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_enabled_get(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;
     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;

+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_enabled_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_enabled_get",_kwnames,&_argo0)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -949,17 +964,18 @@ static PyObject *_wrap_wxToolBarTool_m_enabled_get(PyObject *self, PyObject *arg
 }
 
 #define wxToolBarTool_m_bitmap1_set(_swigobj,_swigval) (_swigobj->m_bitmap1 = *(_swigval),_swigval)
 }
 
 #define wxToolBarTool_m_bitmap1_set(_swigobj,_swigval) (_swigobj->m_bitmap1 = *(_swigval),_swigval)

-static PyObject *_wrap_wxToolBarTool_m_bitmap1_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_bitmap1_set(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxBitmap * _result;
     wxToolBarTool * _arg0;
     wxBitmap * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
     PyObject * _resultobj;
     wxBitmap * _result;
     wxToolBarTool * _arg0;
     wxBitmap * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;

+    char *_kwnames[] = { "self","m_bitmap1", NULL };

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

-    if(!PyArg_ParseTuple(args,"OO:wxToolBarTool_m_bitmap1_set",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxToolBarTool_m_bitmap1_set",_kwnames,&_argo0,&_argo1)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -991,15 +1007,16 @@ static PyObject *_wrap_wxToolBarTool_m_bitmap1_set(PyObject *self, PyObject *arg
 }
 
 #define wxToolBarTool_m_bitmap1_get(_swigobj) (&_swigobj->m_bitmap1)
 }
 
 #define wxToolBarTool_m_bitmap1_get(_swigobj) (&_swigobj->m_bitmap1)

-static PyObject *_wrap_wxToolBarTool_m_bitmap1_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_bitmap1_get(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxBitmap * _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;
     PyObject * _resultobj;
     wxBitmap * _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;

+    char *_kwnames[] = { "self", NULL };

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

-    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_bitmap1_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_bitmap1_get",_kwnames,&_argo0)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -1024,17 +1041,18 @@ static PyObject *_wrap_wxToolBarTool_m_bitmap1_get(PyObject *self, PyObject *arg
 }
 
 #define wxToolBarTool_m_bitmap2_set(_swigobj,_swigval) (_swigobj->m_bitmap2 = *(_swigval),_swigval)
 }
 
 #define wxToolBarTool_m_bitmap2_set(_swigobj,_swigval) (_swigobj->m_bitmap2 = *(_swigval),_swigval)

-static PyObject *_wrap_wxToolBarTool_m_bitmap2_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_bitmap2_set(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxBitmap * _result;
     wxToolBarTool * _arg0;
     wxBitmap * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
     PyObject * _resultobj;
     wxBitmap * _result;
     wxToolBarTool * _arg0;
     wxBitmap * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;

+    char *_kwnames[] = { "self","m_bitmap2", NULL };

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

-    if(!PyArg_ParseTuple(args,"OO:wxToolBarTool_m_bitmap2_set",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxToolBarTool_m_bitmap2_set",_kwnames,&_argo0,&_argo1)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -1066,15 +1084,16 @@ static PyObject *_wrap_wxToolBarTool_m_bitmap2_set(PyObject *self, PyObject *arg
 }
 
 #define wxToolBarTool_m_bitmap2_get(_swigobj) (&_swigobj->m_bitmap2)
 }
 
 #define wxToolBarTool_m_bitmap2_get(_swigobj) (&_swigobj->m_bitmap2)

-static PyObject *_wrap_wxToolBarTool_m_bitmap2_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_bitmap2_get(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxBitmap * _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;
     PyObject * _resultobj;
     wxBitmap * _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;

+    char *_kwnames[] = { "self", NULL };

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

-    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_bitmap2_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_bitmap2_get",_kwnames,&_argo0)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -1099,16 +1118,17 @@ static PyObject *_wrap_wxToolBarTool_m_bitmap2_get(PyObject *self, PyObject *arg
 }
 
 #define wxToolBarTool_m_isMenuCommand_set(_swigobj,_swigval) (_swigobj->m_isMenuCommand = _swigval,_swigval)
 }
 
 #define wxToolBarTool_m_isMenuCommand_set(_swigobj,_swigval) (_swigobj->m_isMenuCommand = _swigval,_swigval)

-static PyObject *_wrap_wxToolBarTool_m_isMenuCommand_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_isMenuCommand_set(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;

+    char *_kwnames[] = { "self","m_isMenuCommand", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"Oi:wxToolBarTool_m_isMenuCommand_set",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarTool_m_isMenuCommand_set",_kwnames,&_argo0,&tempbool1)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -1128,14 +1148,15 @@ static PyObject *_wrap_wxToolBarTool_m_isMenuCommand_set(PyObject *self, PyObjec
 }
 
 #define wxToolBarTool_m_isMenuCommand_get(_swigobj) ((bool ) _swigobj->m_isMenuCommand)
 }
 
 #define wxToolBarTool_m_isMenuCommand_get(_swigobj) ((bool ) _swigobj->m_isMenuCommand)

-static PyObject *_wrap_wxToolBarTool_m_isMenuCommand_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_isMenuCommand_get(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;
     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;

+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_isMenuCommand_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_isMenuCommand_get",_kwnames,&_argo0)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -1154,16 +1175,17 @@ static PyObject *_wrap_wxToolBarTool_m_isMenuCommand_get(PyObject *self, PyObjec
 }
 
 #define wxToolBarTool_m_shortHelpString_set(_swigobj,_swigval) (_swigobj->m_shortHelpString = *(_swigval),_swigval)
 }
 
 #define wxToolBarTool_m_shortHelpString_set(_swigobj,_swigval) (_swigobj->m_shortHelpString = *(_swigval),_swigval)

-static PyObject *_wrap_wxToolBarTool_m_shortHelpString_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_shortHelpString_set(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxString * _result;
     wxToolBarTool * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _resultobj;
     wxString * _result;
     wxToolBarTool * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;

+    char *_kwnames[] = { "self","m_shortHelpString", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"OO:wxToolBarTool_m_shortHelpString_set",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxToolBarTool_m_shortHelpString_set",_kwnames,&_argo0,&_obj1)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -1195,14 +1217,15 @@ static PyObject *_wrap_wxToolBarTool_m_shortHelpString_set(PyObject *self, PyObj
 }
 
 #define wxToolBarTool_m_shortHelpString_get(_swigobj) (&_swigobj->m_shortHelpString)
 }
 
 #define wxToolBarTool_m_shortHelpString_get(_swigobj) (&_swigobj->m_shortHelpString)

-static PyObject *_wrap_wxToolBarTool_m_shortHelpString_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_shortHelpString_get(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxString * _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;
     PyObject * _resultobj;
     wxString * _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;

+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_shortHelpString_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_shortHelpString_get",_kwnames,&_argo0)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -1223,16 +1246,17 @@ static PyObject *_wrap_wxToolBarTool_m_shortHelpString_get(PyObject *self, PyObj
 }
 
 #define wxToolBarTool_m_longHelpString_set(_swigobj,_swigval) (_swigobj->m_longHelpString = *(_swigval),_swigval)
 }
 
 #define wxToolBarTool_m_longHelpString_set(_swigobj,_swigval) (_swigobj->m_longHelpString = *(_swigval),_swigval)

-static PyObject *_wrap_wxToolBarTool_m_longHelpString_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_longHelpString_set(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxString * _result;
     wxToolBarTool * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _resultobj;
     wxString * _result;
     wxToolBarTool * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;

+    char *_kwnames[] = { "self","m_longHelpString", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"OO:wxToolBarTool_m_longHelpString_set",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxToolBarTool_m_longHelpString_set",_kwnames,&_argo0,&_obj1)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -1264,14 +1288,15 @@ static PyObject *_wrap_wxToolBarTool_m_longHelpString_set(PyObject *self, PyObje
 }
 
 #define wxToolBarTool_m_longHelpString_get(_swigobj) (&_swigobj->m_longHelpString)
 }
 
 #define wxToolBarTool_m_longHelpString_get(_swigobj) (&_swigobj->m_longHelpString)

-static PyObject *_wrap_wxToolBarTool_m_longHelpString_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_longHelpString_get(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxString * _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;
     PyObject * _resultobj;
     wxString * _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;

+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_longHelpString_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_longHelpString_get",_kwnames,&_argo0)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -1316,7 +1341,7 @@ static void *SwigwxToolBarTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxToolBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxToolBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
 }
 
 #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) {
+static PyObject *_wrap_new_wxToolBar(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxToolBar * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxToolBar * _result;
     wxWindow * _arg0;


@@ -1326,12 +1351,15 @@ static PyObject *_wrap_new_wxToolBar(PyObject *self, PyObject *args) {
     long  _arg4 = (long ) wxTB_HORIZONTAL|wxNO_BORDER;
     char * _arg5 = (char *) "toolBar";
     PyObject * _argo0 = 0;
     long  _arg4 = (long ) wxTB_HORIZONTAL|wxNO_BORDER;
     char * _arg5 = (char *) "toolBar";
     PyObject * _argo0 = 0;

-    PyObject * _argo2 = 0;
-    PyObject * _argo3 = 0;
+    wxPoint  temp;
+    PyObject * _obj2 = 0;
+    wxSize  temp0;
+    PyObject * _obj3 = 0;
+    char *_kwnames[] = { "parent","id","pos","size","style","name", NULL };

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

-    if(!PyArg_ParseTuple(args,"Oi|OOls:new_wxToolBar",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxToolBar",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4,&_arg5)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -1340,20 +1368,18 @@ static PyObject *_wrap_new_wxToolBar(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
         return NULL;
         }
     }

-    if (_argo2) {
-        if (_argo2 == Py_None) { _arg2 = NULL; }
-        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxToolBar. Expected _wxPoint_p.");
+    if (_obj2)
+{
+    _arg2 = &temp;
+    if (! wxPoint_helper(_obj2, &_arg2))

         return NULL;
         return NULL;

-        }
-    }
-    if (_argo3) {
-        if (_argo3 == Py_None) { _arg3 = NULL; }
-        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxToolBar. Expected _wxSize_p.");
+}
+    if (_obj3)
+{
+    _arg3 = &temp0;
+    if (! wxSize_helper(_obj3, &_arg3))

         return NULL;
         return NULL;

-        }
-    }
+}

 {
     wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxToolBar *)new_wxToolBar(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
 {
     wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxToolBar *)new_wxToolBar(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);


@@ -1370,13 +1396,14 @@ static PyObject *_wrap_new_wxToolBar(PyObject *self, PyObject *args) {
 }
 
 #define wxToolBar_AddSeparator(_swigobj)  (_swigobj->AddSeparator())
 }
 
 #define wxToolBar_AddSeparator(_swigobj)  (_swigobj->AddSeparator())

-static PyObject *_wrap_wxToolBar_AddSeparator(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_AddSeparator(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxToolBar * _arg0;
     PyObject * _argo0 = 0;
     PyObject * _resultobj;
     wxToolBar * _arg0;
     PyObject * _argo0 = 0;

+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"O:wxToolBar_AddSeparator",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBar_AddSeparator",_kwnames,&_argo0)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -1400,7 +1427,7 @@ static wxToolBarTool * wxToolBar_AddTool(wxToolBar *self,int  toolIndex,const wx
                                  isToggle, xPos, yPos, NULL,
                                  shortHelpString, longHelpString);
         }
                                  isToggle, xPos, yPos, NULL,
                                  shortHelpString, longHelpString);
         }

-static PyObject *_wrap_wxToolBar_AddTool(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_AddTool(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxToolBarTool * _result;
     wxToolBar * _arg0;
     PyObject * _resultobj;
     wxToolBarTool * _result;
     wxToolBar * _arg0;


@@ -1417,10 +1444,11 @@ static PyObject *_wrap_wxToolBar_AddTool(PyObject *self, PyObject *args) {
     PyObject * _argo3 = 0;
     PyObject * _obj7 = 0;
     PyObject * _obj8 = 0;
     PyObject * _argo3 = 0;
     PyObject * _obj7 = 0;
     PyObject * _obj8 = 0;

+    char *_kwnames[] = { "self","toolIndex","bitmap1","bitmap2","isToggle","xPos","yPos","shortHelpString","longHelpString", NULL };

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

-    if(!PyArg_ParseTuple(args,"OiO|OillOO:wxToolBar_AddTool",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5,&_arg6,&_obj7,&_obj8)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OillOO:wxToolBar_AddTool",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5,&_arg6,&_obj7,&_obj8)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -1487,7 +1515,7 @@ static wxToolBarTool * wxToolBar_AddSimpleTool(wxToolBar *self,int  toolIndex,co
                                  FALSE, -1, -1, NULL,
                                  shortHelpString, longHelpString);
         }
                                  FALSE, -1, -1, NULL,
                                  shortHelpString, longHelpString);
         }

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

     PyObject * _resultobj;
     wxToolBarTool * _result;
     wxToolBar * _arg0;
     PyObject * _resultobj;
     wxToolBarTool * _result;
     wxToolBar * _arg0;


@@ -1499,10 +1527,11 @@ static PyObject *_wrap_wxToolBar_AddSimpleTool(PyObject *self, PyObject *args) {
     PyObject * _argo2 = 0;
     PyObject * _obj3 = 0;
     PyObject * _obj4 = 0;
     PyObject * _argo2 = 0;
     PyObject * _obj3 = 0;
     PyObject * _obj4 = 0;

+    char *_kwnames[] = { "self","toolIndex","bitmap","shortHelpString","longHelpString", NULL };

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

-    if(!PyArg_ParseTuple(args,"OiO|OO:wxToolBar_AddSimpleTool",&_argo0,&_arg1,&_argo2,&_obj3,&_obj4)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OO:wxToolBar_AddSimpleTool",_kwnames,&_argo0,&_arg1,&_argo2,&_obj3,&_obj4)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -1558,16 +1587,17 @@ static PyObject *_wrap_wxToolBar_AddSimpleTool(PyObject *self, PyObject *args) {
 }
 
 #define wxToolBar_EnableTool(_swigobj,_swigarg0,_swigarg1)  (_swigobj->EnableTool(_swigarg0,_swigarg1))
 }
 
 #define wxToolBar_EnableTool(_swigobj,_swigarg0,_swigarg1)  (_swigobj->EnableTool(_swigarg0,_swigarg1))

-static PyObject *_wrap_wxToolBar_EnableTool(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_EnableTool(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxToolBar * _arg0;
     int  _arg1;
     bool  _arg2;
     PyObject * _argo0 = 0;
     int tempbool2;
     PyObject * _resultobj;
     wxToolBar * _arg0;
     int  _arg1;
     bool  _arg2;
     PyObject * _argo0 = 0;
     int tempbool2;

+    char *_kwnames[] = { "self","toolIndex","enable", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"Oii:wxToolBar_EnableTool",&_argo0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxToolBar_EnableTool",_kwnames,&_argo0,&_arg1,&tempbool2)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -1588,15 +1618,16 @@ static PyObject *_wrap_wxToolBar_EnableTool(PyObject *self, PyObject *args) {
 }
 
 #define wxToolBar_GetToolEnabled(_swigobj,_swigarg0)  (_swigobj->GetToolEnabled(_swigarg0))
 }
 
 #define wxToolBar_GetToolEnabled(_swigobj,_swigarg0)  (_swigobj->GetToolEnabled(_swigarg0))

-static PyObject *_wrap_wxToolBar_GetToolEnabled(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_GetToolEnabled(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxToolBar * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
     PyObject * _resultobj;
     bool  _result;
     wxToolBar * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;

+    char *_kwnames[] = { "self","toolIndex", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"Oi:wxToolBar_GetToolEnabled",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBar_GetToolEnabled",_kwnames,&_argo0,&_arg1)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -1615,15 +1646,16 @@ static PyObject *_wrap_wxToolBar_GetToolEnabled(PyObject *self, PyObject *args)
 }
 
 #define wxToolBar_GetToolLongHelp(_swigobj,_swigarg0)  (_swigobj->GetToolLongHelp(_swigarg0))
 }
 
 #define wxToolBar_GetToolLongHelp(_swigobj,_swigarg0)  (_swigobj->GetToolLongHelp(_swigarg0))

-static PyObject *_wrap_wxToolBar_GetToolLongHelp(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_GetToolLongHelp(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxString * _result;
     wxToolBar * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
     PyObject * _resultobj;
     wxString * _result;
     wxToolBar * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;

+    char *_kwnames[] = { "self","toolIndex", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"Oi:wxToolBar_GetToolLongHelp",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBar_GetToolLongHelp",_kwnames,&_argo0,&_arg1)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -1647,14 +1679,15 @@ static PyObject *_wrap_wxToolBar_GetToolLongHelp(PyObject *self, PyObject *args)
 }
 
 #define wxToolBar_GetToolPacking(_swigobj)  (_swigobj->GetToolPacking())
 }
 
 #define wxToolBar_GetToolPacking(_swigobj)  (_swigobj->GetToolPacking())

-static PyObject *_wrap_wxToolBar_GetToolPacking(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_GetToolPacking(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     int  _result;
     wxToolBar * _arg0;
     PyObject * _argo0 = 0;
     PyObject * _resultobj;
     int  _result;
     wxToolBar * _arg0;
     PyObject * _argo0 = 0;

+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"O:wxToolBar_GetToolPacking",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBar_GetToolPacking",_kwnames,&_argo0)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -1673,14 +1706,15 @@ static PyObject *_wrap_wxToolBar_GetToolPacking(PyObject *self, PyObject *args)
 }
 
 #define wxToolBar_GetToolSeparation(_swigobj)  (_swigobj->GetToolSeparation())
 }
 
 #define wxToolBar_GetToolSeparation(_swigobj)  (_swigobj->GetToolSeparation())

-static PyObject *_wrap_wxToolBar_GetToolSeparation(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_GetToolSeparation(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     int  _result;
     wxToolBar * _arg0;
     PyObject * _argo0 = 0;
     PyObject * _resultobj;
     int  _result;
     wxToolBar * _arg0;
     PyObject * _argo0 = 0;

+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"O:wxToolBar_GetToolSeparation",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBar_GetToolSeparation",_kwnames,&_argo0)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -1699,15 +1733,16 @@ static PyObject *_wrap_wxToolBar_GetToolSeparation(PyObject *self, PyObject *arg
 }
 
 #define wxToolBar_GetToolShortHelp(_swigobj,_swigarg0)  (_swigobj->GetToolShortHelp(_swigarg0))
 }
 
 #define wxToolBar_GetToolShortHelp(_swigobj,_swigarg0)  (_swigobj->GetToolShortHelp(_swigarg0))

-static PyObject *_wrap_wxToolBar_GetToolShortHelp(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_GetToolShortHelp(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxString * _result;
     wxToolBar * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
     PyObject * _resultobj;
     wxString * _result;
     wxToolBar * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;

+    char *_kwnames[] = { "self","toolIndex", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"Oi:wxToolBar_GetToolShortHelp",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBar_GetToolShortHelp",_kwnames,&_argo0,&_arg1)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -1731,15 +1766,16 @@ static PyObject *_wrap_wxToolBar_GetToolShortHelp(PyObject *self, PyObject *args
 }
 
 #define wxToolBar_GetToolState(_swigobj,_swigarg0)  (_swigobj->GetToolState(_swigarg0))
 }
 
 #define wxToolBar_GetToolState(_swigobj,_swigarg0)  (_swigobj->GetToolState(_swigarg0))

-static PyObject *_wrap_wxToolBar_GetToolState(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_GetToolState(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxToolBar * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
     PyObject * _resultobj;
     bool  _result;
     wxToolBar * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;

+    char *_kwnames[] = { "self","toolIndex", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"Oi:wxToolBar_GetToolState",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBar_GetToolState",_kwnames,&_argo0,&_arg1)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -1758,14 +1794,15 @@ static PyObject *_wrap_wxToolBar_GetToolState(PyObject *self, PyObject *args) {
 }
 
 #define wxToolBar_Realize(_swigobj)  (_swigobj->Realize())
 }
 
 #define wxToolBar_Realize(_swigobj)  (_swigobj->Realize())

-static PyObject *_wrap_wxToolBar_Realize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_Realize(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     bool  _result;
     wxToolBar * _arg0;
     PyObject * _argo0 = 0;
     PyObject * _resultobj;
     bool  _result;
     wxToolBar * _arg0;
     PyObject * _argo0 = 0;

+    char *_kwnames[] = { "self", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"O:wxToolBar_Realize",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBar_Realize",_kwnames,&_argo0)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -1784,16 +1821,17 @@ static PyObject *_wrap_wxToolBar_Realize(PyObject *self, PyObject *args) {
 }
 
 #define wxToolBar_SetToolLongHelp(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetToolLongHelp(_swigarg0,_swigarg1))
 }
 
 #define wxToolBar_SetToolLongHelp(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetToolLongHelp(_swigarg0,_swigarg1))

-static PyObject *_wrap_wxToolBar_SetToolLongHelp(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_SetToolLongHelp(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxToolBar * _arg0;
     int  _arg1;
     wxString * _arg2;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
     PyObject * _resultobj;
     wxToolBar * _arg0;
     int  _arg1;
     wxString * _arg2;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;

+    char *_kwnames[] = { "self","toolIndex","helpString", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"OiO:wxToolBar_SetToolLongHelp",&_argo0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxToolBar_SetToolLongHelp",_kwnames,&_argo0,&_arg1,&_obj2)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -1824,16 +1862,17 @@ static PyObject *_wrap_wxToolBar_SetToolLongHelp(PyObject *self, PyObject *args)
 }
 
 #define wxToolBar_SetToolShortHelp(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetToolShortHelp(_swigarg0,_swigarg1))
 }
 
 #define wxToolBar_SetToolShortHelp(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetToolShortHelp(_swigarg0,_swigarg1))

-static PyObject *_wrap_wxToolBar_SetToolShortHelp(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_SetToolShortHelp(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxToolBar * _arg0;
     int  _arg1;
     wxString * _arg2;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
     PyObject * _resultobj;
     wxToolBar * _arg0;
     int  _arg1;
     wxString * _arg2;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;

+    char *_kwnames[] = { "self","toolIndex","helpString", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"OiO:wxToolBar_SetToolShortHelp",&_argo0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxToolBar_SetToolShortHelp",_kwnames,&_argo0,&_arg1,&_obj2)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -1864,15 +1903,17 @@ static PyObject *_wrap_wxToolBar_SetToolShortHelp(PyObject *self, PyObject *args
 }
 
 #define wxToolBar_SetMargins(_swigobj,_swigarg0)  (_swigobj->SetMargins(_swigarg0))
 }
 
 #define wxToolBar_SetMargins(_swigobj,_swigarg0)  (_swigobj->SetMargins(_swigarg0))

-static PyObject *_wrap_wxToolBar_SetMargins(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_SetMargins(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxToolBar * _arg0;
     wxSize * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _resultobj;
     wxToolBar * _arg0;
     wxSize * _arg1;
     PyObject * _argo0 = 0;

-    PyObject * _argo1 = 0;
+    wxSize  temp;
+    PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","size", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"OO:wxToolBar_SetMargins",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxToolBar_SetMargins",_kwnames,&_argo0,&_obj1)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -1881,13 +1922,11 @@ static PyObject *_wrap_wxToolBar_SetMargins(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
         return NULL;
         }
     }

-    if (_argo1) {
-        if (_argo1 == Py_None) { _arg1 = NULL; }
-        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxSize_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBar_SetMargins. Expected _wxSize_p.");
+{
+    _arg1 = &temp;
+    if (! wxSize_helper(_obj1, &_arg1))

         return NULL;
         return NULL;

-        }
-    }
+}

 {
     wxPy_BEGIN_ALLOW_THREADS;
         wxToolBar_SetMargins(_arg0,*_arg1);
 {
     wxPy_BEGIN_ALLOW_THREADS;
         wxToolBar_SetMargins(_arg0,*_arg1);


@@ -1899,14 +1938,15 @@ static PyObject *_wrap_wxToolBar_SetMargins(PyObject *self, PyObject *args) {
 }
 
 #define wxToolBar_SetToolPacking(_swigobj,_swigarg0)  (_swigobj->SetToolPacking(_swigarg0))
 }
 
 #define wxToolBar_SetToolPacking(_swigobj,_swigarg0)  (_swigobj->SetToolPacking(_swigarg0))

-static PyObject *_wrap_wxToolBar_SetToolPacking(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_SetToolPacking(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxToolBar * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
     PyObject * _resultobj;
     wxToolBar * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;

+    char *_kwnames[] = { "self","packing", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"Oi:wxToolBar_SetToolPacking",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBar_SetToolPacking",_kwnames,&_argo0,&_arg1)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -1926,14 +1966,15 @@ static PyObject *_wrap_wxToolBar_SetToolPacking(PyObject *self, PyObject *args)
 }
 
 #define wxToolBar_SetToolSeparation(_swigobj,_swigarg0)  (_swigobj->SetToolSeparation(_swigarg0))
 }
 
 #define wxToolBar_SetToolSeparation(_swigobj,_swigarg0)  (_swigobj->SetToolSeparation(_swigarg0))

-static PyObject *_wrap_wxToolBar_SetToolSeparation(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_SetToolSeparation(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxToolBar * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
     PyObject * _resultobj;
     wxToolBar * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;

+    char *_kwnames[] = { "self","separation", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"Oi:wxToolBar_SetToolSeparation",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBar_SetToolSeparation",_kwnames,&_argo0,&_arg1)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -1953,16 +1994,17 @@ static PyObject *_wrap_wxToolBar_SetToolSeparation(PyObject *self, PyObject *arg
 }
 
 #define wxToolBar_ToggleTool(_swigobj,_swigarg0,_swigarg1)  (_swigobj->ToggleTool(_swigarg0,_swigarg1))
 }
 
 #define wxToolBar_ToggleTool(_swigobj,_swigarg0,_swigarg1)  (_swigobj->ToggleTool(_swigarg0,_swigarg1))

-static PyObject *_wrap_wxToolBar_ToggleTool(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_ToggleTool(PyObject *self, PyObject *args, PyObject *kwargs) {

     PyObject * _resultobj;
     wxToolBar * _arg0;
     int  _arg1;
     bool  _arg2;
     PyObject * _argo0 = 0;
     int tempbool2;
     PyObject * _resultobj;
     wxToolBar * _arg0;
     int  _arg1;
     bool  _arg2;
     PyObject * _argo0 = 0;
     int tempbool2;

+    char *_kwnames[] = { "self","toolIndex","toggle", NULL };

 
     self = self;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"Oii:wxToolBar_ToggleTool",&_argo0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxToolBar_ToggleTool",_kwnames,&_argo0,&_arg1,&tempbool2)) 

         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }


@@ -1983,60 +2025,60 @@ static PyObject *_wrap_wxToolBar_ToggleTool(PyObject *self, PyObject *args) {
 }
 
 static PyMethodDef stattoolcMethods[] = {
 }
 
 static PyMethodDef stattoolcMethods[] = {

-        { "wxToolBar_ToggleTool", _wrap_wxToolBar_ToggleTool, METH_VARARGS },
-        { "wxToolBar_SetToolSeparation", _wrap_wxToolBar_SetToolSeparation, METH_VARARGS },
-        { "wxToolBar_SetToolPacking", _wrap_wxToolBar_SetToolPacking, METH_VARARGS },
-        { "wxToolBar_SetMargins", _wrap_wxToolBar_SetMargins, METH_VARARGS },
-        { "wxToolBar_SetToolShortHelp", _wrap_wxToolBar_SetToolShortHelp, METH_VARARGS },
-        { "wxToolBar_SetToolLongHelp", _wrap_wxToolBar_SetToolLongHelp, METH_VARARGS },
-        { "wxToolBar_Realize", _wrap_wxToolBar_Realize, METH_VARARGS },
-        { "wxToolBar_GetToolState", _wrap_wxToolBar_GetToolState, METH_VARARGS },
-        { "wxToolBar_GetToolShortHelp", _wrap_wxToolBar_GetToolShortHelp, METH_VARARGS },
-        { "wxToolBar_GetToolSeparation", _wrap_wxToolBar_GetToolSeparation, METH_VARARGS },
-        { "wxToolBar_GetToolPacking", _wrap_wxToolBar_GetToolPacking, METH_VARARGS },
-        { "wxToolBar_GetToolLongHelp", _wrap_wxToolBar_GetToolLongHelp, METH_VARARGS },
-        { "wxToolBar_GetToolEnabled", _wrap_wxToolBar_GetToolEnabled, METH_VARARGS },
-        { "wxToolBar_EnableTool", _wrap_wxToolBar_EnableTool, METH_VARARGS },
-        { "wxToolBar_AddSimpleTool", _wrap_wxToolBar_AddSimpleTool, METH_VARARGS },
-        { "wxToolBar_AddTool", _wrap_wxToolBar_AddTool, METH_VARARGS },
-        { "wxToolBar_AddSeparator", _wrap_wxToolBar_AddSeparator, METH_VARARGS },
-        { "new_wxToolBar", _wrap_new_wxToolBar, METH_VARARGS },
-        { "wxToolBarTool_m_longHelpString_get", _wrap_wxToolBarTool_m_longHelpString_get, METH_VARARGS },
-        { "wxToolBarTool_m_longHelpString_set", _wrap_wxToolBarTool_m_longHelpString_set, METH_VARARGS },
-        { "wxToolBarTool_m_shortHelpString_get", _wrap_wxToolBarTool_m_shortHelpString_get, METH_VARARGS },
-        { "wxToolBarTool_m_shortHelpString_set", _wrap_wxToolBarTool_m_shortHelpString_set, METH_VARARGS },
-        { "wxToolBarTool_m_isMenuCommand_get", _wrap_wxToolBarTool_m_isMenuCommand_get, METH_VARARGS },
-        { "wxToolBarTool_m_isMenuCommand_set", _wrap_wxToolBarTool_m_isMenuCommand_set, METH_VARARGS },
-        { "wxToolBarTool_m_bitmap2_get", _wrap_wxToolBarTool_m_bitmap2_get, METH_VARARGS },
-        { "wxToolBarTool_m_bitmap2_set", _wrap_wxToolBarTool_m_bitmap2_set, METH_VARARGS },
-        { "wxToolBarTool_m_bitmap1_get", _wrap_wxToolBarTool_m_bitmap1_get, METH_VARARGS },
-        { "wxToolBarTool_m_bitmap1_set", _wrap_wxToolBarTool_m_bitmap1_set, METH_VARARGS },
-        { "wxToolBarTool_m_enabled_get", _wrap_wxToolBarTool_m_enabled_get, METH_VARARGS },
-        { "wxToolBarTool_m_enabled_set", _wrap_wxToolBarTool_m_enabled_set, METH_VARARGS },
-        { "wxToolBarTool_m_deleteSecondBitmap_get", _wrap_wxToolBarTool_m_deleteSecondBitmap_get, METH_VARARGS },
-        { "wxToolBarTool_m_deleteSecondBitmap_set", _wrap_wxToolBarTool_m_deleteSecondBitmap_set, METH_VARARGS },
-        { "wxToolBarTool_m_isToggle_get", _wrap_wxToolBarTool_m_isToggle_get, METH_VARARGS },
-        { "wxToolBarTool_m_isToggle_set", _wrap_wxToolBarTool_m_isToggle_set, METH_VARARGS },
-        { "wxToolBarTool_m_toggleState_get", _wrap_wxToolBarTool_m_toggleState_get, METH_VARARGS },
-        { "wxToolBarTool_m_toggleState_set", _wrap_wxToolBarTool_m_toggleState_set, METH_VARARGS },
-        { "wxToolBarTool_m_index_get", _wrap_wxToolBarTool_m_index_get, METH_VARARGS },
-        { "wxToolBarTool_m_index_set", _wrap_wxToolBarTool_m_index_set, METH_VARARGS },
-        { "wxToolBarTool_m_clientData_get", _wrap_wxToolBarTool_m_clientData_get, METH_VARARGS },
-        { "wxToolBarTool_m_clientData_set", _wrap_wxToolBarTool_m_clientData_set, METH_VARARGS },
-        { "wxToolBarTool_m_toolStyle_get", _wrap_wxToolBarTool_m_toolStyle_get, METH_VARARGS },
-        { "wxToolBarTool_m_toolStyle_set", _wrap_wxToolBarTool_m_toolStyle_set, METH_VARARGS },
-        { "delete_wxToolBarTool", _wrap_delete_wxToolBarTool, METH_VARARGS },
-        { "new_wxToolBarTool", _wrap_new_wxToolBarTool, METH_VARARGS },
-        { "wxStatusBar_SetStatusWidths", _wrap_wxStatusBar_SetStatusWidths, METH_VARARGS },
-        { "wxStatusBar_SetStatusText", _wrap_wxStatusBar_SetStatusText, METH_VARARGS },
-        { "wxStatusBar_SetFieldsCount", _wrap_wxStatusBar_SetFieldsCount, METH_VARARGS },
-        { "wxStatusBar_InitColours", _wrap_wxStatusBar_InitColours, METH_VARARGS },
-        { "wxStatusBar_DrawFieldText", _wrap_wxStatusBar_DrawFieldText, METH_VARARGS },
-        { "wxStatusBar_DrawField", _wrap_wxStatusBar_DrawField, METH_VARARGS },
-        { "wxStatusBar_GetStatusText", _wrap_wxStatusBar_GetStatusText, METH_VARARGS },
-        { "wxStatusBar_GetFieldsCount", _wrap_wxStatusBar_GetFieldsCount, METH_VARARGS },
-        { "wxStatusBar_GetFieldRect", _wrap_wxStatusBar_GetFieldRect, METH_VARARGS },
-        { "new_wxStatusBar", _wrap_new_wxStatusBar, METH_VARARGS },
+        { "wxToolBar_ToggleTool", (PyCFunction) _wrap_wxToolBar_ToggleTool, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBar_SetToolSeparation", (PyCFunction) _wrap_wxToolBar_SetToolSeparation, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBar_SetToolPacking", (PyCFunction) _wrap_wxToolBar_SetToolPacking, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBar_SetMargins", (PyCFunction) _wrap_wxToolBar_SetMargins, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBar_SetToolShortHelp", (PyCFunction) _wrap_wxToolBar_SetToolShortHelp, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBar_SetToolLongHelp", (PyCFunction) _wrap_wxToolBar_SetToolLongHelp, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBar_Realize", (PyCFunction) _wrap_wxToolBar_Realize, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBar_GetToolState", (PyCFunction) _wrap_wxToolBar_GetToolState, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBar_GetToolShortHelp", (PyCFunction) _wrap_wxToolBar_GetToolShortHelp, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBar_GetToolSeparation", (PyCFunction) _wrap_wxToolBar_GetToolSeparation, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBar_GetToolPacking", (PyCFunction) _wrap_wxToolBar_GetToolPacking, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBar_GetToolLongHelp", (PyCFunction) _wrap_wxToolBar_GetToolLongHelp, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBar_GetToolEnabled", (PyCFunction) _wrap_wxToolBar_GetToolEnabled, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBar_EnableTool", (PyCFunction) _wrap_wxToolBar_EnableTool, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBar_AddSimpleTool", (PyCFunction) _wrap_wxToolBar_AddSimpleTool, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBar_AddTool", (PyCFunction) _wrap_wxToolBar_AddTool, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBar_AddSeparator", (PyCFunction) _wrap_wxToolBar_AddSeparator, METH_VARARGS | METH_KEYWORDS },
+        { "new_wxToolBar", (PyCFunction) _wrap_new_wxToolBar, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBarTool_m_longHelpString_get", (PyCFunction) _wrap_wxToolBarTool_m_longHelpString_get, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBarTool_m_longHelpString_set", (PyCFunction) _wrap_wxToolBarTool_m_longHelpString_set, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBarTool_m_shortHelpString_get", (PyCFunction) _wrap_wxToolBarTool_m_shortHelpString_get, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBarTool_m_shortHelpString_set", (PyCFunction) _wrap_wxToolBarTool_m_shortHelpString_set, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBarTool_m_isMenuCommand_get", (PyCFunction) _wrap_wxToolBarTool_m_isMenuCommand_get, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBarTool_m_isMenuCommand_set", (PyCFunction) _wrap_wxToolBarTool_m_isMenuCommand_set, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBarTool_m_bitmap2_get", (PyCFunction) _wrap_wxToolBarTool_m_bitmap2_get, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBarTool_m_bitmap2_set", (PyCFunction) _wrap_wxToolBarTool_m_bitmap2_set, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBarTool_m_bitmap1_get", (PyCFunction) _wrap_wxToolBarTool_m_bitmap1_get, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBarTool_m_bitmap1_set", (PyCFunction) _wrap_wxToolBarTool_m_bitmap1_set, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBarTool_m_enabled_get", (PyCFunction) _wrap_wxToolBarTool_m_enabled_get, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBarTool_m_enabled_set", (PyCFunction) _wrap_wxToolBarTool_m_enabled_set, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBarTool_m_deleteSecondBitmap_get", (PyCFunction) _wrap_wxToolBarTool_m_deleteSecondBitmap_get, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBarTool_m_deleteSecondBitmap_set", (PyCFunction) _wrap_wxToolBarTool_m_deleteSecondBitmap_set, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBarTool_m_isToggle_get", (PyCFunction) _wrap_wxToolBarTool_m_isToggle_get, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBarTool_m_isToggle_set", (PyCFunction) _wrap_wxToolBarTool_m_isToggle_set, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBarTool_m_toggleState_get", (PyCFunction) _wrap_wxToolBarTool_m_toggleState_get, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBarTool_m_toggleState_set", (PyCFunction) _wrap_wxToolBarTool_m_toggleState_set, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBarTool_m_index_get", (PyCFunction) _wrap_wxToolBarTool_m_index_get, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBarTool_m_index_set", (PyCFunction) _wrap_wxToolBarTool_m_index_set, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBarTool_m_clientData_get", (PyCFunction) _wrap_wxToolBarTool_m_clientData_get, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBarTool_m_clientData_set", (PyCFunction) _wrap_wxToolBarTool_m_clientData_set, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBarTool_m_toolStyle_get", (PyCFunction) _wrap_wxToolBarTool_m_toolStyle_get, METH_VARARGS | METH_KEYWORDS },
+        { "wxToolBarTool_m_toolStyle_set", (PyCFunction) _wrap_wxToolBarTool_m_toolStyle_set, METH_VARARGS | METH_KEYWORDS },
+        { "delete_wxToolBarTool", (PyCFunction) _wrap_delete_wxToolBarTool, METH_VARARGS | METH_KEYWORDS },
+        { "new_wxToolBarTool", (PyCFunction) _wrap_new_wxToolBarTool, METH_VARARGS | METH_KEYWORDS },
+        { "wxStatusBar_SetStatusWidths", (PyCFunction) _wrap_wxStatusBar_SetStatusWidths, METH_VARARGS | METH_KEYWORDS },
+        { "wxStatusBar_SetStatusText", (PyCFunction) _wrap_wxStatusBar_SetStatusText, METH_VARARGS | METH_KEYWORDS },
+        { "wxStatusBar_SetFieldsCount", (PyCFunction) _wrap_wxStatusBar_SetFieldsCount, METH_VARARGS | METH_KEYWORDS },
+        { "wxStatusBar_InitColours", (PyCFunction) _wrap_wxStatusBar_InitColours, METH_VARARGS | METH_KEYWORDS },
+        { "wxStatusBar_DrawFieldText", (PyCFunction) _wrap_wxStatusBar_DrawFieldText, METH_VARARGS | METH_KEYWORDS },
+        { "wxStatusBar_DrawField", (PyCFunction) _wrap_wxStatusBar_DrawField, METH_VARARGS | METH_KEYWORDS },
+        { "wxStatusBar_GetStatusText", (PyCFunction) _wrap_wxStatusBar_GetStatusText, METH_VARARGS | METH_KEYWORDS },
+        { "wxStatusBar_GetFieldsCount", (PyCFunction) _wrap_wxStatusBar_GetFieldsCount, METH_VARARGS | METH_KEYWORDS },
+        { "wxStatusBar_GetFieldRect", (PyCFunction) _wrap_wxStatusBar_GetFieldRect, METH_VARARGS | METH_KEYWORDS },
+        { "new_wxStatusBar", (PyCFunction) _wrap_new_wxStatusBar, METH_VARARGS | METH_KEYWORDS },

         { NULL, NULL }
 };
 #ifdef __cplusplus
         { NULL, NULL }
 };
 #ifdef __cplusplus


@@ -2051,6 +2093,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxActivateEvent","_wxActivateEvent",0},
     { "_signed_long","_long",0},
     { "_wxMenuEvent","_class_wxMenuEvent",0},
     { "_class_wxActivateEvent","_wxActivateEvent",0},
     { "_signed_long","_long",0},
     { "_wxMenuEvent","_class_wxMenuEvent",0},

+    { "_wxPyBitmapDataObject","_class_wxPyBitmapDataObject",0},
+    { "_wxBitmapDataObject","_class_wxBitmapDataObject",0},
+    { "_class_wxPyCommandEvent","_wxPyCommandEvent",0},
+    { "_wxPrintQuality","_wxCoord",0},

     { "_wxPrintQuality","_int",0},
     { "_wxPrintQuality","_signed_int",0},
     { "_wxPrintQuality","_unsigned_int",0},
     { "_wxPrintQuality","_int",0},
     { "_wxPrintQuality","_signed_int",0},
     { "_wxPrintQuality","_unsigned_int",0},


@@ -2058,7 +2104,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxPrintQuality","_uint",0},
     { "_wxPrintQuality","_EBool",0},
     { "_wxPrintQuality","_size_t",0},
     { "_wxPrintQuality","_uint",0},
     { "_wxPrintQuality","_EBool",0},
     { "_wxPrintQuality","_size_t",0},

+    { "_class_wxCustomDataObject","_wxCustomDataObject",0},

     { "_class_wxRegionIterator","_wxRegionIterator",0},
     { "_class_wxRegionIterator","_wxRegionIterator",0},

+    { "_class_wxPyTextDropTarget","_wxPyTextDropTarget",0},

     { "_class_wxMenuBar","_wxMenuBar",0},
     { "_class_wxEvtHandler","_class_wxToolBar",SwigwxToolBarTowxEvtHandler},
     { "_class_wxEvtHandler","_wxToolBar",SwigwxToolBarTowxEvtHandler},
     { "_class_wxMenuBar","_wxMenuBar",0},
     { "_class_wxEvtHandler","_class_wxToolBar",SwigwxToolBarTowxEvtHandler},
     { "_class_wxEvtHandler","_wxToolBar",SwigwxToolBarTowxEvtHandler},


@@ -2073,25 +2121,34 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxPen","_class_wxPen",0},
     { "_wxUpdateUIEvent","_class_wxUpdateUIEvent",0},
     { "_byte","_unsigned_char",0},
     { "_wxPen","_class_wxPen",0},
     { "_wxUpdateUIEvent","_class_wxUpdateUIEvent",0},
     { "_byte","_unsigned_char",0},

+    { "_wxDataObject","_class_wxDataObject",0},

     { "_wxStaticBox","_class_wxStaticBox",0},
     { "_wxStaticBox","_class_wxStaticBox",0},

+    { "_wxPyDataObjectSimple","_class_wxPyDataObjectSimple",0},
+    { "_wxPyDropSource","_class_wxPyDropSource",0},

     { "_wxChoice","_class_wxChoice",0},
     { "_wxSlider","_class_wxSlider",0},
     { "_long","_wxDash",0},
     { "_long","_unsigned_long",0},
     { "_long","_signed_long",0},
     { "_wxImageList","_class_wxImageList",0},
     { "_wxChoice","_class_wxChoice",0},
     { "_wxSlider","_class_wxSlider",0},
     { "_long","_wxDash",0},
     { "_long","_unsigned_long",0},
     { "_long","_signed_long",0},
     { "_wxImageList","_class_wxImageList",0},

+    { "_wxDataObjectSimple","_class_wxDataObjectSimple",0},

     { "_wxDropFilesEvent","_class_wxDropFilesEvent",0},
     { "_wxBitmapButton","_class_wxBitmapButton",0},
     { "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
     { "_wxDropFilesEvent","_class_wxDropFilesEvent",0},
     { "_wxBitmapButton","_class_wxBitmapButton",0},
     { "_class_wxAcceleratorTable","_wxAcceleratorTable",0},

+    { "_class_wxClipboard","_wxClipboard",0},

     { "_class_wxGauge","_wxGauge",0},
     { "_wxDC","_class_wxDC",0},
     { "_class_wxGauge","_wxGauge",0},
     { "_wxDC","_class_wxDC",0},

+    { "_class_wxBitmapDataObject","_wxBitmapDataObject",0},

     { "_wxSpinEvent","_class_wxSpinEvent",0},
     { "_wxSpinEvent","_class_wxSpinEvent",0},

+    { "_size_t","_wxCoord",0},

     { "_size_t","_wxPrintQuality",0},
     { "_size_t","_unsigned_int",0},
     { "_size_t","_int",0},
     { "_size_t","_wxWindowID",0},
     { "_size_t","_uint",0},
     { "_class_wxRealPoint","_wxRealPoint",0},
     { "_size_t","_wxPrintQuality",0},
     { "_size_t","_unsigned_int",0},
     { "_size_t","_int",0},
     { "_size_t","_wxWindowID",0},
     { "_size_t","_uint",0},
     { "_class_wxRealPoint","_wxRealPoint",0},

+    { "_wxNavigationKeyEvent","_class_wxNavigationKeyEvent",0},
+    { "_wxWindowCreateEvent","_class_wxWindowCreateEvent",0},

     { "_class_wxMenuItem","_wxMenuItem",0},
     { "_class_wxPaintEvent","_wxPaintEvent",0},
     { "_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0},
     { "_class_wxMenuItem","_wxMenuItem",0},
     { "_class_wxPaintEvent","_wxPaintEvent",0},
     { "_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0},


@@ -2103,20 +2160,27 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxPyEvent","_class_wxPyEvent",0},
     { "_wxTextCtrl","_class_wxTextCtrl",0},
     { "_class_wxMask","_wxMask",0},
     { "_wxPyEvent","_class_wxPyEvent",0},
     { "_wxTextCtrl","_class_wxTextCtrl",0},
     { "_class_wxMask","_wxMask",0},

+    { "_wxTextDataObject","_class_wxTextDataObject",0},

     { "_class_wxKeyEvent","_wxKeyEvent",0},
     { "_wxColour","_class_wxColour",0},
     { "_class_wxDialog","_wxDialog",0},
     { "_class_wxKeyEvent","_wxKeyEvent",0},
     { "_wxColour","_class_wxColour",0},
     { "_class_wxDialog","_wxDialog",0},

+    { "_class_wxFileDataObject","_wxFileDataObject",0},

     { "_wxIdleEvent","_class_wxIdleEvent",0},
     { "_class_wxUpdateUIEvent","_wxUpdateUIEvent",0},
     { "_wxToolBar","_class_wxToolBar",0},
     { "_wxIdleEvent","_class_wxIdleEvent",0},
     { "_class_wxUpdateUIEvent","_wxUpdateUIEvent",0},
     { "_wxToolBar","_class_wxToolBar",0},

+    { "_class_wxDataObject","_wxDataObject",0},

     { "_wxStaticLine","_class_wxStaticLine",0},
     { "_wxBrush","_class_wxBrush",0},
     { "_wxStaticLine","_class_wxStaticLine",0},
     { "_wxBrush","_class_wxBrush",0},

+    { "_wxDataFormat","_class_wxDataFormat",0},
+    { "_class_wxDataObjectSimple","_wxDataObjectSimple",0},

     { "_wxShowEvent","_class_wxShowEvent",0},
     { "_wxShowEvent","_class_wxShowEvent",0},

+    { "_uint","_wxCoord",0},

     { "_uint","_wxPrintQuality",0},
     { "_uint","_size_t",0},
     { "_uint","_unsigned_int",0},
     { "_uint","_int",0},
     { "_uint","_wxWindowID",0},
     { "_uint","_wxPrintQuality",0},
     { "_uint","_size_t",0},
     { "_uint","_unsigned_int",0},
     { "_uint","_int",0},
     { "_uint","_wxWindowID",0},

+    { "_wxPyValidator","_class_wxPyValidator",0},

     { "_class_wxEvent","_wxEvent",0},
     { "_wxCheckListBox","_class_wxCheckListBox",0},
     { "_wxRect","_class_wxRect",0},
     { "_class_wxEvent","_wxEvent",0},
     { "_wxCheckListBox","_class_wxCheckListBox",0},
     { "_wxRect","_class_wxRect",0},


@@ -2133,25 +2197,34 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxToolBarTool","_class_wxToolBarTool",0},
     { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
     { "_class_wxNotifyEvent","_wxNotifyEvent",0},
     { "_wxToolBarTool","_class_wxToolBarTool",0},
     { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
     { "_class_wxNotifyEvent","_wxNotifyEvent",0},

+    { "_class_wxValidator","_wxValidator",0},

     { "_class_wxPyEvent","_wxPyEvent",0},
     { "_class_wxIconizeEvent","_wxIconizeEvent",0},
     { "_class_wxStaticBitmap","_wxStaticBitmap",0},
     { "_class_wxToolBar","_wxToolBar",0},
     { "_class_wxPyEvent","_wxPyEvent",0},
     { "_class_wxIconizeEvent","_wxIconizeEvent",0},
     { "_class_wxStaticBitmap","_wxStaticBitmap",0},
     { "_class_wxToolBar","_wxToolBar",0},

+    { "_wxDropTarget","_class_wxDropTarget",0},

     { "_class_wxStaticLine","_wxStaticLine",0},
     { "_wxScrollEvent","_class_wxScrollEvent",0},
     { "_class_wxStaticLine","_wxStaticLine",0},
     { "_wxScrollEvent","_class_wxScrollEvent",0},

+    { "_EBool","_wxCoord",0},

     { "_EBool","_wxPrintQuality",0},
     { "_EBool","_signed_int",0},
     { "_EBool","_int",0},
     { "_EBool","_wxWindowID",0},
     { "_class_wxRegion","_wxRegion",0},
     { "_EBool","_wxPrintQuality",0},
     { "_EBool","_signed_int",0},
     { "_EBool","_int",0},
     { "_EBool","_wxWindowID",0},
     { "_class_wxRegion","_wxRegion",0},

+    { "_class_wxDataFormat","_wxDataFormat",0},

     { "_class_wxDropFilesEvent","_wxDropFilesEvent",0},
     { "_class_wxDropFilesEvent","_wxDropFilesEvent",0},

+    { "_wxWindowDestroyEvent","_class_wxWindowDestroyEvent",0},

     { "_wxStaticText","_class_wxStaticText",0},
     { "_wxFont","_class_wxFont",0},
     { "_wxStaticText","_class_wxStaticText",0},
     { "_wxFont","_class_wxFont",0},

+    { "_class_wxPyDropTarget","_wxPyDropTarget",0},

     { "_wxCloseEvent","_class_wxCloseEvent",0},
     { "_unsigned_long","_wxDash",0},
     { "_unsigned_long","_long",0},
     { "_class_wxRect","_wxRect",0},
     { "_class_wxDC","_wxDC",0},
     { "_wxCloseEvent","_class_wxCloseEvent",0},
     { "_unsigned_long","_wxDash",0},
     { "_unsigned_long","_long",0},
     { "_class_wxRect","_wxRect",0},
     { "_class_wxDC","_wxDC",0},

+    { "_wxScrollWinEvent","_class_wxScrollWinEvent",0},
+    { "_wxQueryNewPaletteEvent","_class_wxQueryNewPaletteEvent",0},
+    { "_class_wxWindowCreateEvent","_wxWindowCreateEvent",0},

     { "_class_wxPyTimer","_wxPyTimer",0},
     { "_wxFocusEvent","_class_wxFocusEvent",0},
     { "_wxMaximizeEvent","_class_wxMaximizeEvent",0},
     { "_class_wxPyTimer","_wxPyTimer",0},
     { "_wxFocusEvent","_class_wxFocusEvent",0},
     { "_wxMaximizeEvent","_class_wxMaximizeEvent",0},


@@ -2161,12 +2234,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxCheckBox","_wxCheckBox",0},
     { "_wxComboBox","_class_wxComboBox",0},
     { "_wxRadioButton","_class_wxRadioButton",0},
     { "_class_wxCheckBox","_wxCheckBox",0},
     { "_wxComboBox","_class_wxComboBox",0},
     { "_wxRadioButton","_class_wxRadioButton",0},

+    { "_signed_int","_wxCoord",0},

     { "_signed_int","_wxPrintQuality",0},
     { "_signed_int","_EBool",0},
     { "_signed_int","_wxWindowID",0},
     { "_signed_int","_int",0},
     { "_class_wxTextCtrl","_wxTextCtrl",0},
     { "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
     { "_signed_int","_wxPrintQuality",0},
     { "_signed_int","_EBool",0},
     { "_signed_int","_wxWindowID",0},
     { "_signed_int","_int",0},
     { "_class_wxTextCtrl","_wxTextCtrl",0},
     { "_wxLayoutConstraints","_class_wxLayoutConstraints",0},

+    { "_class_wxTextDataObject","_wxTextDataObject",0},

     { "_wxMenu","_class_wxMenu",0},
     { "_class_wxMoveEvent","_wxMoveEvent",0},
     { "_wxListBox","_class_wxListBox",0},
     { "_wxMenu","_class_wxMenu",0},
     { "_class_wxMoveEvent","_wxMoveEvent",0},
     { "_wxListBox","_class_wxListBox",0},


@@ -2174,6 +2249,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_WXTYPE","_short",0},
     { "_WXTYPE","_signed_short",0},
     { "_WXTYPE","_unsigned_short",0},
     { "_WXTYPE","_short",0},
     { "_WXTYPE","_signed_short",0},
     { "_WXTYPE","_unsigned_short",0},

+    { "_class_wxDropTarget","_wxDropTarget",0},

     { "_class_wxBrush","_wxBrush",0},
     { "_unsigned_short","_WXTYPE",0},
     { "_unsigned_short","_short",0},
     { "_class_wxBrush","_wxBrush",0},
     { "_unsigned_short","_WXTYPE",0},
     { "_unsigned_short","_short",0},


@@ -2184,8 +2260,13 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxWindow","_wxWindow",0},
     { "_class_wxStaticText","_wxStaticText",0},
     { "_class_wxFont","_wxFont",0},
     { "_class_wxWindow","_wxWindow",0},
     { "_class_wxStaticText","_wxStaticText",0},
     { "_class_wxFont","_wxFont",0},

+    { "_wxClipboard","_class_wxClipboard",0},
+    { "_class_wxPyValidator","_wxPyValidator",0},

     { "_class_wxCloseEvent","_wxCloseEvent",0},
     { "_class_wxCloseEvent","_wxCloseEvent",0},

+    { "_wxBusyInfo","_class_wxBusyInfo",0},

     { "_class_wxMenuEvent","_wxMenuEvent",0},
     { "_class_wxMenuEvent","_wxMenuEvent",0},

+    { "_wxPaletteChangedEvent","_class_wxPaletteChangedEvent",0},
+    { "_class_wxPyBitmapDataObject","_wxPyBitmapDataObject",0},

     { "_wxClientDC","_class_wxClientDC",0},
     { "_wxMouseEvent","_class_wxMouseEvent",0},
     { "_class_wxPoint","_wxPoint",0},
     { "_wxClientDC","_class_wxClientDC",0},
     { "_wxMouseEvent","_class_wxMouseEvent",0},
     { "_class_wxPoint","_wxPoint",0},


@@ -2194,6 +2275,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_signed_short","_WXTYPE",0},
     { "_signed_short","_short",0},
     { "_wxMemoryDC","_class_wxMemoryDC",0},
     { "_signed_short","_WXTYPE",0},
     { "_signed_short","_short",0},
     { "_wxMemoryDC","_class_wxMemoryDC",0},

+    { "_wxPyTextDataObject","_class_wxPyTextDataObject",0},

     { "_wxPaintDC","_class_wxPaintDC",0},
     { "_class_wxWindowDC","_wxWindowDC",0},
     { "_class_wxFocusEvent","_wxFocusEvent",0},
     { "_wxPaintDC","_class_wxPaintDC",0},
     { "_class_wxWindowDC","_wxWindowDC",0},
     { "_class_wxFocusEvent","_wxFocusEvent",0},


@@ -2203,6 +2285,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
     { "_class_wxCursor","_wxCursor",0},
     { "_wxPostScriptDC","_class_wxPostScriptDC",0},
     { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
     { "_class_wxCursor","_wxCursor",0},
     { "_wxPostScriptDC","_class_wxPostScriptDC",0},

+    { "_wxPyFileDropTarget","_class_wxPyFileDropTarget",0},

     { "_wxScrolledWindow","_class_wxScrolledWindow",0},
     { "_unsigned_char","_byte",0},
     { "_class_wxMenu","_wxMenu",0},
     { "_wxScrolledWindow","_class_wxScrolledWindow",0},
     { "_unsigned_char","_byte",0},
     { "_class_wxMenu","_wxMenu",0},


@@ -2210,6 +2293,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxControl","_wxToolBar",SwigwxToolBarTowxControl},
     { "_wxControl","_class_wxControl",0},
     { "_class_wxListBox","_wxListBox",0},
     { "_wxControl","_wxToolBar",SwigwxToolBarTowxControl},
     { "_wxControl","_class_wxControl",0},
     { "_class_wxListBox","_wxListBox",0},

+    { "_unsigned_int","_wxCoord",0},

     { "_unsigned_int","_wxPrintQuality",0},
     { "_unsigned_int","_size_t",0},
     { "_unsigned_int","_uint",0},
     { "_unsigned_int","_wxPrintQuality",0},
     { "_unsigned_int","_size_t",0},
     { "_unsigned_int","_uint",0},


@@ -2222,12 +2306,16 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_short","_unsigned_short",0},
     { "_short","_signed_short",0},
     { "_class_wxStaticBox","_wxStaticBox",0},
     { "_short","_unsigned_short",0},
     { "_short","_signed_short",0},
     { "_class_wxStaticBox","_wxStaticBox",0},

+    { "_class_wxPyDataObjectSimple","_wxPyDataObjectSimple",0},
+    { "_class_wxPyDropSource","_wxPyDropSource",0},

     { "_class_wxScrollEvent","_wxScrollEvent",0},
     { "_wxJoystickEvent","_class_wxJoystickEvent",0},
     { "_class_wxChoice","_wxChoice",0},
     { "_class_wxSlider","_wxSlider",0},
     { "_class_wxImageList","_wxImageList",0},
     { "_class_wxBitmapButton","_wxBitmapButton",0},
     { "_class_wxScrollEvent","_wxScrollEvent",0},
     { "_wxJoystickEvent","_class_wxJoystickEvent",0},
     { "_class_wxChoice","_wxChoice",0},
     { "_class_wxSlider","_wxSlider",0},
     { "_class_wxImageList","_wxImageList",0},
     { "_class_wxBitmapButton","_wxBitmapButton",0},

+    { "_class_wxPaletteChangedEvent","_wxPaletteChangedEvent",0},
+    { "_wxWindowID","_wxCoord",0},

     { "_wxWindowID","_wxPrintQuality",0},
     { "_wxWindowID","_size_t",0},
     { "_wxWindowID","_EBool",0},
     { "_wxWindowID","_wxPrintQuality",0},
     { "_wxWindowID","_size_t",0},
     { "_wxWindowID","_EBool",0},


@@ -2235,6 +2323,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxWindowID","_int",0},
     { "_wxWindowID","_signed_int",0},
     { "_wxWindowID","_unsigned_int",0},
     { "_wxWindowID","_int",0},
     { "_wxWindowID","_signed_int",0},
     { "_wxWindowID","_unsigned_int",0},

+    { "_class_wxScrollWinEvent","_wxScrollWinEvent",0},
+    { "_int","_wxCoord",0},

     { "_int","_wxPrintQuality",0},
     { "_int","_size_t",0},
     { "_int","_EBool",0},
     { "_int","_wxPrintQuality",0},
     { "_int","_size_t",0},
     { "_int","_EBool",0},


@@ -2243,15 +2333,21 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_int","_unsigned_int",0},
     { "_int","_signed_int",0},
     { "_class_wxMouseEvent","_wxMouseEvent",0},
     { "_int","_unsigned_int",0},
     { "_int","_signed_int",0},
     { "_class_wxMouseEvent","_wxMouseEvent",0},

+    { "_wxPyCommandEvent","_class_wxPyCommandEvent",0},

     { "_class_wxSpinEvent","_wxSpinEvent",0},
     { "_class_wxSpinEvent","_wxSpinEvent",0},

+    { "_class_wxQueryNewPaletteEvent","_wxQueryNewPaletteEvent",0},
+    { "_class_wxNavigationKeyEvent","_wxNavigationKeyEvent",0},

     { "_wxButton","_class_wxButton",0},
     { "_wxSize","_class_wxSize",0},
     { "_wxRegionIterator","_class_wxRegionIterator",0},
     { "_wxButton","_class_wxButton",0},
     { "_wxSize","_class_wxSize",0},
     { "_wxRegionIterator","_class_wxRegionIterator",0},

+    { "_class_wxPyTextDataObject","_wxPyTextDataObject",0},

     { "_class_wxPaintDC","_wxPaintDC",0},
     { "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0},
     { "_class_wxPaintDC","_wxPaintDC",0},
     { "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0},

+    { "_class_wxPyFileDropTarget","_wxPyFileDropTarget",0},

     { "_class_wxInitDialogEvent","_wxInitDialogEvent",0},
     { "_class_wxComboBox","_wxComboBox",0},
     { "_class_wxRadioButton","_wxRadioButton",0},
     { "_class_wxInitDialogEvent","_wxInitDialogEvent",0},
     { "_class_wxComboBox","_wxComboBox",0},
     { "_class_wxRadioButton","_wxRadioButton",0},

+    { "_wxValidator","_class_wxValidator",0},

     { "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
     { "_wxIconizeEvent","_class_wxIconizeEvent",0},
     { "_class_wxControl","_class_wxToolBar",SwigwxToolBarTowxControl},
     { "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
     { "_wxIconizeEvent","_class_wxIconizeEvent",0},
     { "_class_wxControl","_class_wxToolBar",SwigwxToolBarTowxControl},


@@ -2263,19 +2359,32 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxScreenDC","_wxScreenDC",0},
     { "_wxPalette","_class_wxPalette",0},
     { "_class_wxIdleEvent","_wxIdleEvent",0},
     { "_class_wxScreenDC","_wxScreenDC",0},
     { "_wxPalette","_class_wxPalette",0},
     { "_class_wxIdleEvent","_wxIdleEvent",0},

+    { "_wxCoord","_int",0},
+    { "_wxCoord","_signed_int",0},
+    { "_wxCoord","_unsigned_int",0},
+    { "_wxCoord","_wxWindowID",0},
+    { "_wxCoord","_uint",0},
+    { "_wxCoord","_EBool",0},
+    { "_wxCoord","_size_t",0},
+    { "_wxCoord","_wxPrintQuality",0},

     { "_wxEraseEvent","_class_wxEraseEvent",0},
     { "_wxEraseEvent","_class_wxEraseEvent",0},

+    { "_wxDataObjectComposite","_class_wxDataObjectComposite",0},

     { "_class_wxJoystickEvent","_wxJoystickEvent",0},
     { "_wxRegion","_class_wxRegion",0},
     { "_class_wxShowEvent","_wxShowEvent",0},
     { "_class_wxJoystickEvent","_wxJoystickEvent",0},
     { "_wxRegion","_class_wxRegion",0},
     { "_class_wxShowEvent","_wxShowEvent",0},

+    { "_wxPyDropTarget","_class_wxPyDropTarget",0},

     { "_wxActivateEvent","_class_wxActivateEvent",0},
     { "_wxGauge","_class_wxGauge",0},
     { "_class_wxCheckListBox","_wxCheckListBox",0},
     { "_wxActivateEvent","_class_wxActivateEvent",0},
     { "_wxGauge","_class_wxGauge",0},
     { "_class_wxCheckListBox","_wxCheckListBox",0},

+    { "_class_wxBusyInfo","_wxBusyInfo",0},

     { "_class_wxCommandEvent","_wxCommandEvent",0},
     { "_class_wxClientDC","_wxClientDC",0},
     { "_class_wxSizeEvent","_wxSizeEvent",0},
     { "_class_wxCommandEvent","_wxCommandEvent",0},
     { "_class_wxClientDC","_wxClientDC",0},
     { "_class_wxSizeEvent","_wxSizeEvent",0},

+    { "_wxCustomDataObject","_class_wxCustomDataObject",0},

     { "_class_wxSize","_wxSize",0},
     { "_class_wxBitmap","_wxBitmap",0},
     { "_class_wxMemoryDC","_wxMemoryDC",0},
     { "_class_wxSize","_wxSize",0},
     { "_class_wxBitmap","_wxBitmap",0},
     { "_class_wxMemoryDC","_wxMemoryDC",0},

+    { "_wxPyTextDropTarget","_class_wxPyTextDropTarget",0},

     { "_wxMenuBar","_class_wxMenuBar",0},
     { "_wxEvtHandler","_class_wxToolBar",SwigwxToolBarTowxEvtHandler},
     { "_wxEvtHandler","_wxToolBar",SwigwxToolBarTowxEvtHandler},
     { "_wxMenuBar","_class_wxMenuBar",0},
     { "_wxEvtHandler","_class_wxToolBar",SwigwxToolBarTowxEvtHandler},
     { "_wxEvtHandler","_wxToolBar",SwigwxToolBarTowxEvtHandler},


@@ -2290,12 +2399,15 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxKeyEvent","_class_wxKeyEvent",0},
     { "_wxMoveEvent","_class_wxMoveEvent",0},
     { "_class_wxPalette","_wxPalette",0},
     { "_wxKeyEvent","_class_wxKeyEvent",0},
     { "_wxMoveEvent","_class_wxMoveEvent",0},
     { "_class_wxPalette","_wxPalette",0},

+    { "_wxFileDataObject","_class_wxFileDataObject",0},

     { "_class_wxEraseEvent","_wxEraseEvent",0},
     { "_class_wxEraseEvent","_wxEraseEvent",0},

+    { "_class_wxDataObjectComposite","_wxDataObjectComposite",0},

     { "_wxWindow","_class_wxToolBar",SwigwxToolBarTowxWindow},
     { "_wxWindow","_wxToolBar",SwigwxToolBarTowxWindow},
     { "_wxWindow","_class_wxStatusBar",SwigwxStatusBarTowxWindow},
     { "_wxWindow","_wxStatusBar",SwigwxStatusBarTowxWindow},
     { "_wxWindow","_class_wxWindow",0},
     { "_wxWindow","_class_wxToolBar",SwigwxToolBarTowxWindow},
     { "_wxWindow","_wxToolBar",SwigwxToolBarTowxWindow},
     { "_wxWindow","_class_wxStatusBar",SwigwxStatusBarTowxWindow},
     { "_wxWindow","_wxStatusBar",SwigwxStatusBarTowxWindow},
     { "_wxWindow","_class_wxWindow",0},

+    { "_class_wxWindowDestroyEvent","_wxWindowDestroyEvent",0},

 {0,0,0}};
 
 static PyObject *SWIG_globals;
 {0,0,0}};
 
 static PyObject *SWIG_globals;