New event locking.

[wxWidgets.git] / utils / wxPython / modules / ogl / oglbasic.cpp

diff --git a/utils/wxPython/modules/ogl/oglbasic.cpp b/utils/wxPython/modules/ogl/oglbasic.cpp
index 768f1c1ff9d32b14f9ee4b179335b583c37aa2d0..715c0712ffb0f82812e4e0a3e7ef189bbd5d5f17 100644 (file)
--- a/utils/wxPython/modules/ogl/oglbasic.cpp
+++ b/utils/wxPython/modules/ogl/oglbasic.cpp
@@ -103,17 +103,6 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     return target;
 }
 
     return target;
 }
 

-
-HELPEREXPORT byte* byte_LIST_helper(PyObject* source);
-HELPEREXPORT int* int_LIST_helper(PyObject* source);
-HELPEREXPORT long* long_LIST_helper(PyObject* source);
-HELPEREXPORT char** string_LIST_helper(PyObject* source);
-HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source);
-HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source);
-HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source);
-HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
-
-

 static char* wxStringErrorMsg = "string type is required for parameter";
 
     WXSHAPE_IMP_CALLBACKS(wxPyShapeEvtHandler,wxShapeEvtHandler);
 static char* wxStringErrorMsg = "string type is required for parameter";
 
     WXSHAPE_IMP_CALLBACKS(wxPyShapeEvtHandler,wxShapeEvtHandler);


@@ -2208,7 +2197,7 @@ static PyObject *_wrap_wxPyShapeEvtHandler_base_OnMoveLink(PyObject *self, PyObj
 static PyObject *_wrap_wxPyShapeEvtHandler_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyShapeEvtHandler * _arg0;
 static PyObject *_wrap_wxPyShapeEvtHandler_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyShapeEvtHandler * _arg0;

-    wxControlPoint * _arg1;
+    wxPyControlPoint * _arg1;

     bool  _arg2;
     double  _arg3;
     double  _arg4;
     bool  _arg2;
     double  _arg3;
     double  _arg4;


@@ -2231,8 +2220,8 @@ static PyObject *_wrap_wxPyShapeEvtHandler_base_OnSizingDragLeft(PyObject *self,
     }
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
     }
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }

-        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxControlPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyShapeEvtHandler_base_OnSizingDragLeft. Expected _wxControlPoint_p.");
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyShapeEvtHandler_base_OnSizingDragLeft. Expected _wxPyControlPoint_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }


@@ -2251,7 +2240,7 @@ static PyObject *_wrap_wxPyShapeEvtHandler_base_OnSizingDragLeft(PyObject *self,
 static PyObject *_wrap_wxPyShapeEvtHandler_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyShapeEvtHandler * _arg0;
 static PyObject *_wrap_wxPyShapeEvtHandler_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyShapeEvtHandler * _arg0;

-    wxControlPoint * _arg1;
+    wxPyControlPoint * _arg1;

     double  _arg2;
     double  _arg3;
     int  _arg4 = (int ) 0;
     double  _arg2;
     double  _arg3;
     int  _arg4 = (int ) 0;


@@ -2272,8 +2261,8 @@ static PyObject *_wrap_wxPyShapeEvtHandler_base_OnSizingBeginDragLeft(PyObject *
     }
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
     }
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }

-        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxControlPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyShapeEvtHandler_base_OnSizingBeginDragLeft. Expected _wxControlPoint_p.");
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyShapeEvtHandler_base_OnSizingBeginDragLeft. Expected _wxPyControlPoint_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }


@@ -2291,7 +2280,7 @@ static PyObject *_wrap_wxPyShapeEvtHandler_base_OnSizingBeginDragLeft(PyObject *
 static PyObject *_wrap_wxPyShapeEvtHandler_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyShapeEvtHandler * _arg0;
 static PyObject *_wrap_wxPyShapeEvtHandler_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyShapeEvtHandler * _arg0;

-    wxControlPoint * _arg1;
+    wxPyControlPoint * _arg1;

     double  _arg2;
     double  _arg3;
     int  _arg4 = (int ) 0;
     double  _arg2;
     double  _arg3;
     int  _arg4 = (int ) 0;


@@ -2312,8 +2301,8 @@ static PyObject *_wrap_wxPyShapeEvtHandler_base_OnSizingEndDragLeft(PyObject *se
     }
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
     }
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }

-        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxControlPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyShapeEvtHandler_base_OnSizingEndDragLeft. Expected _wxControlPoint_p.");
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyShapeEvtHandler_base_OnSizingEndDragLeft. Expected _wxPyControlPoint_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }


@@ -5946,14 +5935,16 @@ static PyObject *_wrap_wxPyShape_CalcSimpleAttachment(PyObject *self, PyObject *
     int  _arg4;
     wxPyLineShape * _arg5;
     PyObject * _argo0 = 0;
     int  _arg4;
     wxPyLineShape * _arg5;
     PyObject * _argo0 = 0;

-    PyObject * _argo1 = 0;
-    PyObject * _argo2 = 0;
+    wxRealPoint  temp;
+    PyObject * _obj1 = 0;
+    wxRealPoint  temp0;
+    PyObject * _obj2 = 0;

     PyObject * _argo5 = 0;
     char *_kwnames[] = { "self","pt1","pt2","nth","noArcs","line", NULL };
     char _ptemp[128];
 
     self = self;
     PyObject * _argo5 = 0;
     char *_kwnames[] = { "self","pt1","pt2","nth","noArcs","line", NULL };
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOiiO:wxPyShape_CalcSimpleAttachment",_kwnames,&_argo0,&_argo1,&_argo2,&_arg3,&_arg4,&_argo5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOiiO:wxPyShape_CalcSimpleAttachment",_kwnames,&_argo0,&_obj1,&_obj2,&_arg3,&_arg4,&_argo5)) 

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


@@ -5962,20 +5953,16 @@ static PyObject *_wrap_wxPyShape_CalcSimpleAttachment(PyObject *self, PyObject *
         return NULL;
         }
     }
         return NULL;
         }
     }

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

         return NULL;
         return NULL;

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

         return NULL;
         return NULL;

-        }
-    }
+}

     if (_argo5) {
         if (_argo5 == Py_None) { _arg5 = NULL; }
         else if (SWIG_GetPtrObj(_argo5,(void **) &_arg5,"_wxPyLineShape_p")) {
     if (_argo5) {
         if (_argo5 == Py_None) { _arg5 = NULL; }
         else if (SWIG_GetPtrObj(_argo5,(void **) &_arg5,"_wxPyLineShape_p")) {


@@ -6002,12 +5989,14 @@ static PyObject *_wrap_wxPyShape_AttachmentSortTest(PyObject *self, PyObject *ar
     wxRealPoint * _arg2;
     wxRealPoint * _arg3;
     PyObject * _argo0 = 0;
     wxRealPoint * _arg2;
     wxRealPoint * _arg3;
     PyObject * _argo0 = 0;

-    PyObject * _argo2 = 0;
-    PyObject * _argo3 = 0;
+    wxRealPoint  temp;
+    PyObject * _obj2 = 0;
+    wxRealPoint  temp0;
+    PyObject * _obj3 = 0;

     char *_kwnames[] = { "self","attachmentPoint","pt1","pt2", NULL };
 
     self = self;
     char *_kwnames[] = { "self","attachmentPoint","pt1","pt2", NULL };
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiOO:wxPyShape_AttachmentSortTest",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiOO:wxPyShape_AttachmentSortTest",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3)) 

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


@@ -6016,20 +6005,16 @@ static PyObject *_wrap_wxPyShape_AttachmentSortTest(PyObject *self, PyObject *ar
         return NULL;
         }
     }
         return NULL;
         }
     }

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

         return NULL;
         return NULL;

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

         return NULL;
         return NULL;

-        }
-    }
+}

 {
     wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxPyShape_AttachmentSortTest(_arg0,_arg1,*_arg2,*_arg3);
 {
     wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxPyShape_AttachmentSortTest(_arg0,_arg1,*_arg2,*_arg3);


@@ -6243,14 +6228,18 @@ static PyObject *_wrap_wxPyShape_GetBranchingAttachmentInfo(PyObject *self, PyOb
     wxRealPoint * _arg4;
     wxRealPoint * _arg5;
     PyObject * _argo0 = 0;
     wxRealPoint * _arg4;
     wxRealPoint * _arg5;
     PyObject * _argo0 = 0;

-    PyObject * _argo2 = 0;
-    PyObject * _argo3 = 0;
-    PyObject * _argo4 = 0;
-    PyObject * _argo5 = 0;
+    wxRealPoint  temp;
+    PyObject * _obj2 = 0;
+    wxRealPoint  temp0;
+    PyObject * _obj3 = 0;
+    wxRealPoint  temp1;
+    PyObject * _obj4 = 0;
+    wxRealPoint  temp2;
+    PyObject * _obj5 = 0;

     char *_kwnames[] = { "self","attachment","root","neck","shoulder1","shoulder2", NULL };
 
     self = self;
     char *_kwnames[] = { "self","attachment","root","neck","shoulder1","shoulder2", NULL };
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiOOOO:wxPyShape_GetBranchingAttachmentInfo",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_argo4,&_argo5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiOOOO:wxPyShape_GetBranchingAttachmentInfo",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_obj4,&_obj5)) 

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


@@ -6259,34 +6248,26 @@ static PyObject *_wrap_wxPyShape_GetBranchingAttachmentInfo(PyObject *self, PyOb
         return NULL;
         }
     }
         return NULL;
         }
     }

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

         return NULL;
         return NULL;

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

         return NULL;
         return NULL;

-        }
-    }
-    if (_argo4) {
-        if (_argo4 == Py_None) { _arg4 = NULL; }
-        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxRealPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of wxPyShape_GetBranchingAttachmentInfo. Expected _wxRealPoint_p.");
+}
+{
+    _arg4 = &temp1;
+    if (! wxRealPoint_helper(_obj4, &_arg4))

         return NULL;
         return NULL;

-        }
-    }
-    if (_argo5) {
-        if (_argo5 == Py_None) { _arg5 = NULL; }
-        else if (SWIG_GetPtrObj(_argo5,(void **) &_arg5,"_wxRealPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of wxPyShape_GetBranchingAttachmentInfo. Expected _wxRealPoint_p.");
+}
+{
+    _arg5 = &temp2;
+    if (! wxRealPoint_helper(_obj5, &_arg5))

         return NULL;
         return NULL;

-        }
-    }
+}

 {
     wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxPyShape_GetBranchingAttachmentInfo(_arg0,_arg1,*_arg2,*_arg3,*_arg4,*_arg5);
 {
     wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxPyShape_GetBranchingAttachmentInfo(_arg0,_arg1,*_arg2,*_arg3,*_arg4,*_arg5);


@@ -6306,12 +6287,14 @@ static PyObject *_wrap_wxPyShape_GetBranchingAttachmentPoint(PyObject *self, PyO
     wxRealPoint * _arg3;
     wxRealPoint * _arg4;
     PyObject * _argo0 = 0;
     wxRealPoint * _arg3;
     wxRealPoint * _arg4;
     PyObject * _argo0 = 0;

-    PyObject * _argo3 = 0;
-    PyObject * _argo4 = 0;
+    wxRealPoint  temp;
+    PyObject * _obj3 = 0;
+    wxRealPoint  temp0;
+    PyObject * _obj4 = 0;

     char *_kwnames[] = { "self","attachment","n","attachmentPoint","stemPoint", NULL };
 
     self = self;
     char *_kwnames[] = { "self","attachment","n","attachmentPoint","stemPoint", NULL };
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiiOO:wxPyShape_GetBranchingAttachmentPoint",_kwnames,&_argo0,&_arg1,&_arg2,&_argo3,&_argo4)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiiOO:wxPyShape_GetBranchingAttachmentPoint",_kwnames,&_argo0,&_arg1,&_arg2,&_obj3,&_obj4)) 

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


@@ -6320,20 +6303,16 @@ static PyObject *_wrap_wxPyShape_GetBranchingAttachmentPoint(PyObject *self, PyO
         return NULL;
         }
     }
         return NULL;
         }
     }

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

         return NULL;
         return NULL;

-        }
-    }
-    if (_argo4) {
-        if (_argo4 == Py_None) { _arg4 = NULL; }
-        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxRealPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of wxPyShape_GetBranchingAttachmentPoint. Expected _wxRealPoint_p.");
+}
+{
+    _arg4 = &temp0;
+    if (! wxRealPoint_helper(_obj4, &_arg4))

         return NULL;
         return NULL;

-        }
-    }
+}

 {
     wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxPyShape_GetBranchingAttachmentPoint(_arg0,_arg1,_arg2,*_arg3,*_arg4);
 {
     wxPy_BEGIN_ALLOW_THREADS;
         _result = (bool )wxPyShape_GetBranchingAttachmentPoint(_arg0,_arg1,_arg2,*_arg3,*_arg4);


@@ -7815,7 +7794,7 @@ static PyObject *_wrap_wxPyShape_base_OnMoveLink(PyObject *self, PyObject *args,
 static PyObject *_wrap_wxPyShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyShape * _arg0;
 static PyObject *_wrap_wxPyShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyShape * _arg0;

-    wxControlPoint * _arg1;
+    wxPyControlPoint * _arg1;

     bool  _arg2;
     double  _arg3;
     double  _arg4;
     bool  _arg2;
     double  _arg3;
     double  _arg4;


@@ -7838,8 +7817,8 @@ static PyObject *_wrap_wxPyShape_base_OnSizingDragLeft(PyObject *self, PyObject
     }
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
     }
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }

-        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxControlPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyShape_base_OnSizingDragLeft. Expected _wxControlPoint_p.");
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyShape_base_OnSizingDragLeft. Expected _wxPyControlPoint_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }


@@ -7858,7 +7837,7 @@ static PyObject *_wrap_wxPyShape_base_OnSizingDragLeft(PyObject *self, PyObject
 static PyObject *_wrap_wxPyShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyShape * _arg0;
 static PyObject *_wrap_wxPyShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyShape * _arg0;

-    wxControlPoint * _arg1;
+    wxPyControlPoint * _arg1;

     double  _arg2;
     double  _arg3;
     int  _arg4 = (int ) 0;
     double  _arg2;
     double  _arg3;
     int  _arg4 = (int ) 0;


@@ -7879,8 +7858,8 @@ static PyObject *_wrap_wxPyShape_base_OnSizingBeginDragLeft(PyObject *self, PyOb
     }
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
     }
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }

-        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxControlPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyShape_base_OnSizingBeginDragLeft. Expected _wxControlPoint_p.");
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyShape_base_OnSizingBeginDragLeft. Expected _wxPyControlPoint_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }


@@ -7898,7 +7877,7 @@ static PyObject *_wrap_wxPyShape_base_OnSizingBeginDragLeft(PyObject *self, PyOb
 static PyObject *_wrap_wxPyShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyShape * _arg0;
 static PyObject *_wrap_wxPyShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyShape * _arg0;

-    wxControlPoint * _arg1;
+    wxPyControlPoint * _arg1;

     double  _arg2;
     double  _arg3;
     int  _arg4 = (int ) 0;
     double  _arg2;
     double  _arg3;
     int  _arg4 = (int ) 0;


@@ -7919,8 +7898,8 @@ static PyObject *_wrap_wxPyShape_base_OnSizingEndDragLeft(PyObject *self, PyObje
     }
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
     }
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }

-        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxControlPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyShape_base_OnSizingEndDragLeft. Expected _wxControlPoint_p.");
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyShape_base_OnSizingEndDragLeft. Expected _wxPyControlPoint_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }


@@ -8239,6 +8218,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_signed_long","_long",0},
     { "_wxMenuEvent","_class_wxMenuEvent",0},
     { "_class_wxJPEGHandler","_wxJPEGHandler",0},
     { "_signed_long","_long",0},
     { "_wxMenuEvent","_class_wxMenuEvent",0},
     { "_class_wxJPEGHandler","_wxJPEGHandler",0},

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

     { "_wxBMPHandler","_class_wxBMPHandler",0},
     { "_wxImage","_class_wxImage",0},
     { "_wxPrintQuality","_int",0},
     { "_wxBMPHandler","_class_wxBMPHandler",0},
     { "_wxImage","_class_wxImage",0},
     { "_wxPrintQuality","_int",0},


@@ -8253,9 +8233,11 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxRegionIterator","_wxRegionIterator",0},
     { "_class_wxMenuBar","_wxMenuBar",0},
     { "_class_wxPyTreeItemData","_wxPyTreeItemData",0},
     { "_class_wxRegionIterator","_wxRegionIterator",0},
     { "_class_wxMenuBar","_wxMenuBar",0},
     { "_class_wxPyTreeItemData","_wxPyTreeItemData",0},

+    { "_class_wxStaticBoxSizer","_wxStaticBoxSizer",0},

     { "_class_wxEvtHandler","_wxEvtHandler",0},
     { "_wxPaintEvent","_class_wxPaintEvent",0},
     { "_wxGIFHandler","_class_wxGIFHandler",0},
     { "_class_wxEvtHandler","_wxEvtHandler",0},
     { "_wxPaintEvent","_class_wxPaintEvent",0},
     { "_wxGIFHandler","_class_wxGIFHandler",0},

+    { "_wxPySizer","_class_wxPySizer",0},

     { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
     { "_wxCursor","_class_wxCursor",0},
     { "_wxNotifyEvent","_class_wxNotifyEvent",0},
     { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
     { "_wxCursor","_class_wxCursor",0},
     { "_wxNotifyEvent","_class_wxNotifyEvent",0},


@@ -8284,11 +8266,13 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxDropFilesEvent","_class_wxDropFilesEvent",0},
     { "_wxBitmapButton","_class_wxBitmapButton",0},
     { "_wxSashWindow","_class_wxSashWindow",0},
     { "_wxDropFilesEvent","_class_wxDropFilesEvent",0},
     { "_wxBitmapButton","_class_wxBitmapButton",0},
     { "_wxSashWindow","_class_wxSashWindow",0},

+    { "_class_wxSizer","_wxSizer",0},

     { "_class_wxPrintDialogData","_wxPrintDialogData",0},
     { "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
     { "_class_wxGauge","_wxGauge",0},
     { "_class_wxSashEvent","_wxSashEvent",0},
     { "_wxDC","_class_wxDC",0},
     { "_class_wxPrintDialogData","_wxPrintDialogData",0},
     { "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
     { "_class_wxGauge","_wxGauge",0},
     { "_class_wxSashEvent","_wxSashEvent",0},
     { "_wxDC","_class_wxDC",0},

+    { "_wxSizerItem","_class_wxSizerItem",0},

     { "_wxListEvent","_class_wxListEvent",0},
     { "_class_wxSingleChoiceDialog","_wxSingleChoiceDialog",0},
     { "_wxProgressDialog","_class_wxProgressDialog",0},
     { "_wxListEvent","_class_wxListEvent",0},
     { "_class_wxSingleChoiceDialog","_wxSingleChoiceDialog",0},
     { "_wxProgressDialog","_class_wxProgressDialog",0},


@@ -8311,6 +8295,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0},
     { "_class_wxStatusBar","_wxStatusBar",0},
     { "_class_wxGIFHandler","_wxGIFHandler",0},
     { "_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0},
     { "_class_wxStatusBar","_wxStatusBar",0},
     { "_class_wxGIFHandler","_wxGIFHandler",0},

+    { "_class_wxPySizer","_wxPySizer",0},

     { "_wxPanel","_class_wxPanel",0},
     { "_wxInitDialogEvent","_class_wxInitDialogEvent",0},
     { "_wxCheckBox","_class_wxCheckBox",0},
     { "_wxPanel","_class_wxPanel",0},
     { "_wxInitDialogEvent","_class_wxInitDialogEvent",0},
     { "_wxCheckBox","_class_wxCheckBox",0},


@@ -8328,6 +8313,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxIdleEvent","_class_wxIdleEvent",0},
     { "_class_wxUpdateUIEvent","_wxUpdateUIEvent",0},
     { "_wxToolBar","_class_wxToolBar",0},
     { "_wxIdleEvent","_class_wxIdleEvent",0},
     { "_class_wxUpdateUIEvent","_wxUpdateUIEvent",0},
     { "_wxToolBar","_class_wxToolBar",0},

+    { "_wxCaret","_class_wxCaret",0},

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


@@ -8341,6 +8327,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_uint","_unsigned_int",0},
     { "_uint","_int",0},
     { "_uint","_wxWindowID",0},
     { "_uint","_unsigned_int",0},
     { "_uint","_int",0},
     { "_uint","_wxWindowID",0},

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

     { "_class_wxEvent","_wxEvent",0},
     { "_wxCheckListBox","_class_wxCheckListBox",0},
     { "_wxSplitterEvent","_class_wxSplitterEvent",0},
     { "_class_wxEvent","_wxEvent",0},
     { "_wxCheckListBox","_class_wxCheckListBox",0},
     { "_wxSplitterEvent","_class_wxSplitterEvent",0},


@@ -8354,6 +8341,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxButton","_wxButton",0},
     { "_wxRadioBox","_class_wxRadioBox",0},
     { "_class_wxFontData","_wxFontData",0},
     { "_class_wxButton","_wxButton",0},
     { "_wxRadioBox","_class_wxRadioBox",0},
     { "_class_wxFontData","_wxFontData",0},

+    { "_wxBoxSizer","_class_wxBoxSizer",0},

     { "_class___wxPyCleanup","___wxPyCleanup",0},
     { "_wxBitmap","_class_wxBitmap",0},
     { "_wxTaskBarIcon","_class_wxTaskBarIcon",0},
     { "_class___wxPyCleanup","___wxPyCleanup",0},
     { "_wxBitmap","_class_wxBitmap",0},
     { "_wxTaskBarIcon","_class_wxTaskBarIcon",0},


@@ -8368,6 +8356,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
     { "_class_wxNotifyEvent","_wxNotifyEvent",0},
     { "_wxMessageDialog","_class_wxMessageDialog",0},
     { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
     { "_class_wxNotifyEvent","_wxNotifyEvent",0},
     { "_wxMessageDialog","_class_wxMessageDialog",0},

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

     { "_class_wxPyEvent","_wxPyEvent",0},
     { "_wxTextEntryDialog","_class_wxTextEntryDialog",0},
     { "_class_wxIconizeEvent","_wxIconizeEvent",0},
     { "_class_wxPyEvent","_wxPyEvent",0},
     { "_wxTextEntryDialog","_class_wxTextEntryDialog",0},
     { "_class_wxIconizeEvent","_wxIconizeEvent",0},


@@ -8395,6 +8384,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_unsigned_long","_long",0},
     { "_class_wxRect","_wxRect",0},
     { "_class_wxDC","_wxDC",0},
     { "_unsigned_long","_long",0},
     { "_class_wxRect","_wxRect",0},
     { "_class_wxDC","_wxDC",0},

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

     { "_class_wxProgressDialog","_wxProgressDialog",0},
     { "_wxPyApp","_class_wxPyApp",0},
     { "_wxMDIParentFrame","_class_wxMDIParentFrame",0},
     { "_class_wxProgressDialog","_wxProgressDialog",0},
     { "_wxPyApp","_class_wxPyApp",0},
     { "_wxMDIParentFrame","_class_wxMDIParentFrame",0},


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

+    { "_class_wxCaret","_wxCaret",0},

     { "_class_wxMDIClientWindow","_wxMDIClientWindow",0},
     { "_class_wxBrush","_wxBrush",0},
     { "_unsigned_short","_WXTYPE",0},
     { "_class_wxMDIClientWindow","_wxMDIClientWindow",0},
     { "_class_wxBrush","_wxBrush",0},
     { "_unsigned_short","_WXTYPE",0},


@@ -8435,6 +8426,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxStaticText","_wxStaticText",0},
     { "_wxPrintDialogData","_class_wxPrintDialogData",0},
     { "_class_wxFont","_wxFont",0},
     { "_class_wxStaticText","_wxStaticText",0},
     { "_wxPrintDialogData","_class_wxPrintDialogData",0},
     { "_class_wxFont","_wxFont",0},

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

     { "_class_wxCloseEvent","_wxCloseEvent",0},
     { "_wxSashEvent","_class_wxSashEvent",0},
     { "_class_wxMenuEvent","_wxMenuEvent",0},
     { "_class_wxCloseEvent","_wxCloseEvent",0},
     { "_wxSashEvent","_class_wxSashEvent",0},
     { "_class_wxMenuEvent","_wxMenuEvent",0},


@@ -8446,6 +8438,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxRealPoint","_class_wxRealPoint",0},
     { "_class_wxRadioBox","_wxRadioBox",0},
     { "_wxGridCell","_class_wxGridCell",0},
     { "_wxRealPoint","_class_wxRealPoint",0},
     { "_class_wxRadioBox","_wxRadioBox",0},
     { "_wxGridCell","_class_wxGridCell",0},

+    { "_class_wxBoxSizer","_wxBoxSizer",0},

     { "_signed_short","_WXTYPE",0},
     { "_signed_short","_short",0},
     { "_wxMemoryDC","_class_wxMemoryDC",0},
     { "_signed_short","_WXTYPE",0},
     { "_signed_short","_short",0},
     { "_wxMemoryDC","_class_wxMemoryDC",0},


@@ -8501,6 +8494,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},
+    { "_class_wxSizerItem","_wxSizerItem",0},

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


@@ -8509,6 +8504,7 @@ 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_wxListEvent","_wxListEvent",0},
     { "_class_wxPrintPreview","_wxPrintPreview",0},
     { "_class_wxSpinEvent","_wxSpinEvent",0},
     { "_class_wxListEvent","_wxListEvent",0},
     { "_class_wxPrintPreview","_wxPrintPreview",0},
     { "_class_wxSpinEvent","_wxSpinEvent",0},


@@ -8519,12 +8515,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxPrinterDC","_wxPrinterDC",0},
     { "_class_wxMDIParentFrame","_wxMDIParentFrame",0},
     { "_wxPyTreeItemData","_class_wxPyTreeItemData",0},
     { "_class_wxPrinterDC","_wxPrinterDC",0},
     { "_class_wxMDIParentFrame","_wxMDIParentFrame",0},
     { "_wxPyTreeItemData","_class_wxPyTreeItemData",0},

+    { "_wxStaticBoxSizer","_class_wxStaticBoxSizer",0},

     { "_class_wxPaintDC","_wxPaintDC",0},
     { "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0},
     { "_class_wxInitDialogEvent","_wxInitDialogEvent",0},
     { "_class_wxComboBox","_wxComboBox",0},
     { "_class_wxRadioButton","_wxRadioButton",0},
     { "_class_wxPyShape","_wxPyShape",0},
     { "_class_wxPaintDC","_wxPaintDC",0},
     { "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0},
     { "_class_wxInitDialogEvent","_wxInitDialogEvent",0},
     { "_class_wxComboBox","_wxComboBox",0},
     { "_class_wxRadioButton","_wxRadioButton",0},
     { "_class_wxPyShape","_wxPyShape",0},

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

     { "_class_wxTreeItemId","_wxTreeItemId",0},
     { "_wxTreeCtrl","_class_wxTreeCtrl",0},
     { "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
     { "_class_wxTreeItemId","_wxTreeItemId",0},
     { "_wxTreeCtrl","_class_wxTreeCtrl",0},
     { "_class_wxLayoutConstraints","_wxLayoutConstraints",0},


@@ -8544,6 +8542,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxRegion","_class_wxRegion",0},
     { "_class_wxSplitterWindow","_wxSplitterWindow",0},
     { "_wxPreviewFrame","_class_wxPreviewFrame",0},
     { "_wxRegion","_class_wxRegion",0},
     { "_class_wxSplitterWindow","_wxSplitterWindow",0},
     { "_wxPreviewFrame","_class_wxPreviewFrame",0},

+    { "_wxSizer","_class_wxSizer",0},

     { "_class_wxShowEvent","_wxShowEvent",0},
     { "_wxActivateEvent","_class_wxActivateEvent",0},
     { "_wxGauge","_class_wxGauge",0},
     { "_class_wxShowEvent","_wxShowEvent",0},
     { "_wxActivateEvent","_class_wxActivateEvent",0},
     { "_wxGauge","_class_wxGauge",0},