Created and wrapped wxPyControlPoint

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

utils/wxPython/modules/ogl/_extras.py

@@ -13,7 +13,7 @@ wxCircleShape =       wxPyCircleShape
 wxLineShape =         wxPyLineShape
 wxPolygonShape =      wxPyPolygonShape
 wxTextShape =         wxPyTextShape
-
+wxControlPoint =      wxPyControlPoint
 
 # Stuff these names into the wx namespace so wxPyConstructObject can find them
 import wx
@@ -33,4 +33,4 @@ wx.wxPyPolygonShapePtr    = wxPyPolygonShapePtr
 wx.wxPyTextShapePtr       = wxPyTextShapePtr
 wx.wxShapeRegionPtr       = wxShapeRegionPtr
 wx.wxOGLConstraintPtr     = wxOGLConstraintPtr
-wx.wxControlPointPtr      = wxControlPointPtr
+wx.wxControlPointPtr      = wxPyControlPointPtr

utils/wxPython/modules/ogl/_ogldefs.i

@@ -31,6 +31,7 @@ class wxShape;
 class wxShapeCanvas;
 class wxShapeEvtHandler;
 class wxTextShape;
+class wxControlPoint;
 
 class wxPyOGLConstraint;
 class wxPyBitmapShape;
@@ -49,6 +50,7 @@ class wxPyShape;
 class wxPyShapeCanvas;
 class wxPyShapeEvtHandler;
 class wxPyTextShape;
+class wxPyControlPoint;
 
 
 //---------------------------------------------------------------------------

utils/wxPython/modules/ogl/ogl.cpp

@@ -1,5 +1,5 @@
 /*
- * FILE : ogl.cpp
+ * FILE : ./ogl.cpp
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
@@ -108,17 +108,6 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     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";
 
 #if defined(__WXMSW__)
@@ -186,6 +175,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_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},
@@ -200,9 +190,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_wxStaticBoxSizer","_wxStaticBoxSizer",0},
     { "_class_wxEvtHandler","_wxEvtHandler",0},
     { "_wxPaintEvent","_class_wxPaintEvent",0},
     { "_wxGIFHandler","_class_wxGIFHandler",0},
+    { "_wxPySizer","_class_wxPySizer",0},
     { "_wxPyCompositeShape","_class_wxPyCompositeShape",0},
     { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
     { "_wxCursor","_class_wxCursor",0},
@@ -236,11 +228,13 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_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},
+    { "_wxSizerItem","_class_wxSizerItem",0},
     { "_wxListEvent","_class_wxListEvent",0},
     { "_class_wxSingleChoiceDialog","_wxSingleChoiceDialog",0},
     { "_wxProgressDialog","_class_wxProgressDialog",0},
@@ -256,15 +250,16 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_size_t","_wxWindowID",0},
     { "_size_t","_uint",0},
     { "_class_wxRealPoint","_wxRealPoint",0},
+    { "_wxPrinterDC","_class_wxPrinterDC",0},
     { "_class_wxPyShapeEvtHandler","_wxPyShapeEvtHandler",0},
     { "_class_wxMenuItem","_wxMenuItem",0},
     { "_class_wxPaintEvent","_wxPaintEvent",0},
     { "_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0},
     { "_class_wxStatusBar","_wxStatusBar",0},
     { "_class_wxGIFHandler","_wxGIFHandler",0},
+    { "_class_wxPySizer","_wxPySizer",0},
     { "_class_wxPyCompositeShape","_wxPyCompositeShape",0},
     { "_wxPyPolygonShape","_class_wxPyPolygonShape",0},
-    { "_class_wxPostScriptDC","_wxPostScriptDC",0},
     { "_wxPanel","_class_wxPanel",0},
     { "_wxInitDialogEvent","_class_wxInitDialogEvent",0},
     { "_wxCheckBox","_class_wxCheckBox",0},
@@ -311,9 +306,12 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_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},
     { "_wxPrintDialog","_class_wxPrintDialog",0},
+    { "_wxPyControlPoint","_class_wxPyControlPoint",0},
     { "_wxPyTimer","_class_wxPyTimer",0},
     { "_wxWindowDC","_class_wxWindowDC",0},
     { "_wxScrollBar","_class_wxScrollBar",0},
@@ -379,6 +377,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_signed_int","_int",0},
     { "_class_wxTextCtrl","_wxTextCtrl",0},
     { "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
+    { "_wxMetaFileDC","_class_wxMetaFileDC",0},
     { "_wxMenu","_class_wxMenu",0},
     { "_class_wxMoveEvent","_wxMoveEvent",0},
     { "_wxListBox","_class_wxListBox",0},
@@ -411,10 +410,13 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_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},
+    { "_class_wxTaskBarIcon","_wxTaskBarIcon",0},
     { "_class_wxPrintDialog","_wxPrintDialog",0},
+    { "_class_wxPyControlPoint","_wxPyControlPoint",0},
     { "_wxPaintDC","_class_wxPaintDC",0},
     { "_class_wxWindowDC","_wxWindowDC",0},
     { "_class_wxFocusEvent","_wxFocusEvent",0},
@@ -423,12 +425,12 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxToolBarTool","_wxToolBarTool",0},
     { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
     { "_class_wxCursor","_wxCursor",0},
-    { "_wxPostScriptDC","_class_wxPostScriptDC",0},
     { "_class_wxImageHandler","_wxImageHandler",0},
     { "_wxPyShape","_class_wxPyShape",0},
     { "_wxScrolledWindow","_class_wxScrolledWindow",0},
     { "_wxTreeItemId","_class_wxTreeItemId",0},
     { "_unsigned_char","_byte",0},
+    { "_class_wxMetaFileDC","_wxMetaFileDC",0},
     { "_class_wxMenu","_wxMenu",0},
     { "_wxControl","_class_wxControl",0},
     { "_class_wxListBox","_wxListBox",0},
@@ -468,6 +470,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_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},
@@ -476,6 +479,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_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},
@@ -483,8 +487,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxPyApp","_wxPyApp",0},
     { "_wxSize","_class_wxSize",0},
     { "_wxRegionIterator","_class_wxRegionIterator",0},
+    { "_class_wxPrinterDC","_wxPrinterDC",0},
     { "_class_wxMDIParentFrame","_wxMDIParentFrame",0},
     { "_wxPyTreeItemData","_class_wxPyTreeItemData",0},
+    { "_wxStaticBoxSizer","_class_wxStaticBoxSizer",0},
     { "_class_wxPyLineShape","_wxPyLineShape",0},
     { "_class_wxPaintDC","_wxPaintDC",0},
     { "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0},
@@ -512,6 +518,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxRegion","_class_wxRegion",0},
     { "_class_wxSplitterWindow","_wxSplitterWindow",0},
     { "_wxPreviewFrame","_class_wxPreviewFrame",0},
+    { "_wxSizer","_class_wxSizer",0},
     { "_class_wxShowEvent","_wxShowEvent",0},
     { "_wxDiagram","_class_wxDiagram",0},
     { "_wxActivateEvent","_class_wxActivateEvent",0},

utils/wxPython/modules/ogl/ogl.py

@@ -31,6 +31,8 @@ from image import *
 
 from printfw import *
 
+from sizers import *
+
 from oglbasic import *
 
 from oglshapes import *
@@ -132,7 +134,7 @@ wxCircleShape =       wxPyCircleShape
 wxLineShape =         wxPyLineShape
 wxPolygonShape =      wxPyPolygonShape
 wxTextShape =         wxPyTextShape
-
+wxControlPoint =      wxPyControlPoint
 
 # Stuff these names into the wx namespace so wxPyConstructObject can find them
 import wx
@@ -152,4 +154,4 @@ wx.wxPyPolygonShapePtr    = wxPyPolygonShapePtr
 wx.wxPyTextShapePtr       = wxPyTextShapePtr
 wx.wxShapeRegionPtr       = wxShapeRegionPtr
 wx.wxOGLConstraintPtr     = wxOGLConstraintPtr
-wx.wxControlPointPtr      = wxControlPointPtr
+wx.wxControlPointPtr      = wxPyControlPointPtr

utils/wxPython/modules/ogl/oglbasic.cpp

@@ -1,5 +1,5 @@
 /*
- * FILE : oglbasic.cpp
+ * FILE : ./oglbasic.cpp
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
@@ -103,17 +103,6 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     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);
@@ -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;
-    wxControlPoint * _arg1;
+    wxPyControlPoint * _arg1;
     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; }
-        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_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 _wxControlPoint_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyShapeEvtHandler_base_OnSizingDragLeft. Expected _wxPyControlPoint_p.");
         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;
-    wxControlPoint * _arg1;
+    wxPyControlPoint * _arg1;
     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; }
-        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_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 _wxControlPoint_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyShapeEvtHandler_base_OnSizingBeginDragLeft. Expected _wxPyControlPoint_p.");
         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;
-    wxControlPoint * _arg1;
+    wxPyControlPoint * _arg1;
     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; }
-        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_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 _wxControlPoint_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyShapeEvtHandler_base_OnSizingEndDragLeft. Expected _wxPyControlPoint_p.");
         return NULL;
         }
     }
@@ -5946,14 +5935,16 @@ static PyObject *_wrap_wxPyShape_CalcSimpleAttachment(PyObject *self, PyObject *
     int  _arg4;
     wxPyLineShape * _arg5;
     PyObject * _argo0 = 0;
-    PyObject * _argo1 = 0;
+    wxRealPoint  temp;
-    PyObject * _argo2 = 0;
+    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;
-    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; }
@@ -5962,20 +5953,16 @@ static PyObject *_wrap_wxPyShape_CalcSimpleAttachment(PyObject *self, PyObject *
         return NULL;
         }
     }
-    if (_argo1) {
+{
-        if (_argo1 == Py_None) { _arg1 = NULL; }
+    _arg1 = &temp;
-        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRealPoint_p")) {
+    if (! wxRealPoint_helper(_obj1, &_arg1))
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyShape_CalcSimpleAttachment. Expected _wxRealPoint_p.");
         return NULL;
-        }
+}
-    }
+{
-    if (_argo2) {
+    _arg2 = &temp0;
-        if (_argo2 == Py_None) { _arg2 = NULL; }
+    if (! wxRealPoint_helper(_obj2, &_arg2))
-        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxRealPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxPyShape_CalcSimpleAttachment. Expected _wxRealPoint_p.");
         return NULL;
-        }
+}
-    }
     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;
-    PyObject * _argo2 = 0;
+    wxRealPoint  temp;
-    PyObject * _argo3 = 0;
+    PyObject * _obj2 = 0;
+    wxRealPoint  temp0;
+    PyObject * _obj3 = 0;
     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; }
@@ -6016,20 +6005,16 @@ static PyObject *_wrap_wxPyShape_AttachmentSortTest(PyObject *self, PyObject *ar
         return NULL;
         }
     }
-    if (_argo2) {
+{
-        if (_argo2 == Py_None) { _arg2 = NULL; }
+    _arg2 = &temp;
-        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxRealPoint_p")) {
+    if (! wxRealPoint_helper(_obj2, &_arg2))
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxPyShape_AttachmentSortTest. Expected _wxRealPoint_p.");
         return NULL;
-        }
+}
-    }
+{
-    if (_argo3) {
+    _arg3 = &temp0;
-        if (_argo3 == Py_None) { _arg3 = NULL; }
+    if (! wxRealPoint_helper(_obj3, &_arg3))
-        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxRealPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxPyShape_AttachmentSortTest. Expected _wxRealPoint_p.");
         return NULL;
-        }
+}
-    }
 {
     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;
-    PyObject * _argo2 = 0;
+    wxRealPoint  temp;
-    PyObject * _argo3 = 0;
+    PyObject * _obj2 = 0;
-    PyObject * _argo4 = 0;
+    wxRealPoint  temp0;
-    PyObject * _argo5 = 0;
+    PyObject * _obj3 = 0;
+    wxRealPoint  temp1;
+    PyObject * _obj4 = 0;
+    wxRealPoint  temp2;
+    PyObject * _obj5 = 0;
     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; }
@@ -6259,34 +6248,26 @@ static PyObject *_wrap_wxPyShape_GetBranchingAttachmentInfo(PyObject *self, PyOb
         return NULL;
         }
     }
-    if (_argo2) {
+{
-        if (_argo2 == Py_None) { _arg2 = NULL; }
+    _arg2 = &temp;
-        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxRealPoint_p")) {
+    if (! wxRealPoint_helper(_obj2, &_arg2))
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxPyShape_GetBranchingAttachmentInfo. Expected _wxRealPoint_p.");
         return NULL;
-        }
+}
-    }
+{
-    if (_argo3) {
+    _arg3 = &temp0;
-        if (_argo3 == Py_None) { _arg3 = NULL; }
+    if (! wxRealPoint_helper(_obj3, &_arg3))
-        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxRealPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxPyShape_GetBranchingAttachmentInfo. Expected _wxRealPoint_p.");
         return NULL;
-        }
+}
-    }
+{
-    if (_argo4) {
+    _arg4 = &temp1;
-        if (_argo4 == Py_None) { _arg4 = NULL; }
+    if (! wxRealPoint_helper(_obj4, &_arg4))
-        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxRealPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of wxPyShape_GetBranchingAttachmentInfo. Expected _wxRealPoint_p.");
         return NULL;
-        }
+}
-    }
+{
-    if (_argo5) {
+    _arg5 = &temp2;
-        if (_argo5 == Py_None) { _arg5 = NULL; }
+    if (! wxRealPoint_helper(_obj5, &_arg5))
-        else if (SWIG_GetPtrObj(_argo5,(void **) &_arg5,"_wxRealPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of wxPyShape_GetBranchingAttachmentInfo. Expected _wxRealPoint_p.");
         return NULL;
-        }
+}
-    }
 {
     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;
-    PyObject * _argo3 = 0;
+    wxRealPoint  temp;
-    PyObject * _argo4 = 0;
+    PyObject * _obj3 = 0;
+    wxRealPoint  temp0;
+    PyObject * _obj4 = 0;
     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; }
@@ -6320,20 +6303,16 @@ static PyObject *_wrap_wxPyShape_GetBranchingAttachmentPoint(PyObject *self, PyO
         return NULL;
         }
     }
-    if (_argo3) {
+{
-        if (_argo3 == Py_None) { _arg3 = NULL; }
+    _arg3 = &temp;
-        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxRealPoint_p")) {
+    if (! wxRealPoint_helper(_obj3, &_arg3))
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxPyShape_GetBranchingAttachmentPoint. Expected _wxRealPoint_p.");
         return NULL;
-        }
+}
-    }
+{
-    if (_argo4) {
+    _arg4 = &temp0;
-        if (_argo4 == Py_None) { _arg4 = NULL; }
+    if (! wxRealPoint_helper(_obj4, &_arg4))
-        else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxRealPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of wxPyShape_GetBranchingAttachmentPoint. Expected _wxRealPoint_p.");
         return NULL;
-        }
+}
-    }
 {
     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;
-    wxControlPoint * _arg1;
+    wxPyControlPoint * _arg1;
     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; }
-        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_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 _wxControlPoint_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyShape_base_OnSizingDragLeft. Expected _wxPyControlPoint_p.");
         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;
-    wxControlPoint * _arg1;
+    wxPyControlPoint * _arg1;
     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; }
-        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_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 _wxControlPoint_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyShape_base_OnSizingBeginDragLeft. Expected _wxPyControlPoint_p.");
         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;
-    wxControlPoint * _arg1;
+    wxPyControlPoint * _arg1;
     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; }
-        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_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 _wxControlPoint_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyShape_base_OnSizingEndDragLeft. Expected _wxPyControlPoint_p.");
         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},
+    { "_class_wxPyCommandEvent","_wxPyCommandEvent",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_wxStaticBoxSizer","_wxStaticBoxSizer",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},
@@ -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},
+    { "_class_wxSizer","_wxSizer",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},
@@ -8302,6 +8286,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_size_t","_wxWindowID",0},
     { "_size_t","_uint",0},
     { "_class_wxRealPoint","_wxRealPoint",0},
+    { "_wxPrinterDC","_class_wxPrinterDC",0},
     { "_class_wxPyShapeEvtHandler","_class_wxPyShape",SwigwxPyShapeTowxPyShapeEvtHandler},
     { "_class_wxPyShapeEvtHandler","_wxPyShape",SwigwxPyShapeTowxPyShapeEvtHandler},
     { "_class_wxPyShapeEvtHandler","_wxPyShapeEvtHandler",0},
@@ -8310,7 +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},
-    { "_class_wxPostScriptDC","_wxPostScriptDC",0},
+    { "_class_wxPySizer","_wxPySizer",0},
     { "_wxPanel","_class_wxPanel",0},
     { "_wxInitDialogEvent","_class_wxInitDialogEvent",0},
     { "_wxCheckBox","_class_wxCheckBox",0},
@@ -8354,8 +8339,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_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},
     { "_wxPrintDialog","_class_wxPrintDialog",0},
     { "_wxPyTimer","_class_wxPyTimer",0},
     { "_wxWindowDC","_class_wxWindowDC",0},
@@ -8416,6 +8403,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_signed_int","_int",0},
     { "_class_wxTextCtrl","_wxTextCtrl",0},
     { "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
+    { "_wxMetaFileDC","_class_wxMetaFileDC",0},
     { "_wxMenu","_class_wxMenu",0},
     { "_class_wxMoveEvent","_wxMoveEvent",0},
     { "_wxListBox","_class_wxListBox",0},
@@ -8445,9 +8433,11 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_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},
+    { "_class_wxTaskBarIcon","_wxTaskBarIcon",0},
     { "_class_wxPrintDialog","_wxPrintDialog",0},
     { "_wxPaintDC","_class_wxPaintDC",0},
     { "_class_wxWindowDC","_wxWindowDC",0},
@@ -8457,12 +8447,12 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxToolBarTool","_wxToolBarTool",0},
     { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
     { "_class_wxCursor","_wxCursor",0},
-    { "_wxPostScriptDC","_class_wxPostScriptDC",0},
     { "_class_wxImageHandler","_wxImageHandler",0},
     { "_wxPyShape","_class_wxPyShape",0},
     { "_wxScrolledWindow","_class_wxScrolledWindow",0},
     { "_wxTreeItemId","_class_wxTreeItemId",0},
     { "_unsigned_char","_byte",0},
+    { "_class_wxMetaFileDC","_wxMetaFileDC",0},
     { "_class_wxMenu","_wxMenu",0},
     { "_wxControl","_class_wxControl",0},
     { "_class_wxListBox","_wxListBox",0},
@@ -8500,6 +8490,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_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},
@@ -8508,6 +8499,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_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},
@@ -8515,8 +8507,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxPyApp","_wxPyApp",0},
     { "_wxSize","_class_wxSize",0},
     { "_wxRegionIterator","_class_wxRegionIterator",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},
@@ -8542,6 +8536,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_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},

utils/wxPython/modules/ogl/oglbasic.i

@@ -129,9 +129,9 @@ public:
     void base_OnDrawControlPoints(wxDC& dc);
     void base_OnEraseControlPoints(wxDC& dc);
     void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
-    void base_OnSizingDragLeft(wxControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
     void base_OnBeginSize(double w, double h);
     void base_OnEndSize(double w, double h);
 //    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
@@ -368,9 +368,9 @@ public:
     void base_OnDrawControlPoints(wxDC& dc);
     void base_OnEraseControlPoints(wxDC& dc);
     void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
-    void base_OnSizingDragLeft(wxControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
     void base_OnBeginSize(double w, double h);
     void base_OnEndSize(double w, double h);
 //    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);

utils/wxPython/modules/ogl/oglbasic.py

@@ -30,6 +30,8 @@ from windows3 import *
 from image import *
 
 from printfw import *
+
+from sizers import *
 import wx
 from oglcanvas import wxPyShapeCanvasPtr
 class wxShapeRegionPtr :

utils/wxPython/modules/ogl/oglcanvas.cpp

@@ -1,5 +1,5 @@
 /*
- * FILE : oglcanvas.cpp
+ * FILE : ./oglcanvas.cpp
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
@@ -103,17 +103,6 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     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";
 
     IMP_PYCALLBACK__2DBLINT(wxPyShapeCanvas, wxShapeCanvas, OnBeginDragLeft);
@@ -1191,13 +1180,15 @@ static PyObject *_wrap_new_wxPyShapeCanvas(PyObject *self, PyObject *args, PyObj
     wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
     long  _arg4 = (long ) wxBORDER;
     PyObject * _argo0 = 0;
-    PyObject * _argo2 = 0;
+    wxPoint  temp;
-    PyObject * _argo3 = 0;
+    PyObject * _obj2 = 0;
+    wxSize  temp0;
+    PyObject * _obj3 = 0;
     char *_kwnames[] = { "parent","id","pos","size","style", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|OiOOl:new_wxPyShapeCanvas",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|OiOOl:new_wxPyShapeCanvas",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1206,20 +1197,18 @@ static PyObject *_wrap_new_wxPyShapeCanvas(PyObject *self, PyObject *args, PyObj
         return NULL;
         }
     }
-    if (_argo2) {
+    if (_obj2)
-        if (_argo2 == Py_None) { _arg2 = NULL; }
+{
-        else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) {
+    _arg2 = &temp;
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxPyShapeCanvas. Expected _wxPoint_p.");
+    if (! wxPoint_helper(_obj2, &_arg2))
         return NULL;
-        }
+}
-    }
+    if (_obj3)
-    if (_argo3) {
+{
-        if (_argo3 == Py_None) { _arg3 = NULL; }
+    _arg3 = &temp0;
-        else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) {
+    if (! wxSize_helper(_obj3, &_arg3))
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxPyShapeCanvas. Expected _wxSize_p.");
         return NULL;
-        }
+}
-    }
 {
     wxPy_BEGIN_ALLOW_THREADS;
         _result = (wxPyShapeCanvas *)new_wxPyShapeCanvas(_arg0,_arg1,*_arg2,*_arg3,_arg4);
@@ -1984,6 +1973,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_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},
@@ -1998,11 +1988,13 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxRegionIterator","_wxRegionIterator",0},
     { "_class_wxMenuBar","_wxMenuBar",0},
     { "_class_wxPyTreeItemData","_wxPyTreeItemData",0},
+    { "_class_wxStaticBoxSizer","_wxStaticBoxSizer",0},
     { "_class_wxEvtHandler","_class_wxPyShapeCanvas",SwigwxPyShapeCanvasTowxEvtHandler},
     { "_class_wxEvtHandler","_wxPyShapeCanvas",SwigwxPyShapeCanvasTowxEvtHandler},
     { "_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},
@@ -2031,11 +2023,13 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_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},
+    { "_wxSizerItem","_class_wxSizerItem",0},
     { "_wxListEvent","_class_wxListEvent",0},
     { "_class_wxSingleChoiceDialog","_wxSingleChoiceDialog",0},
     { "_wxProgressDialog","_class_wxProgressDialog",0},
@@ -2049,13 +2043,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_size_t","_wxWindowID",0},
     { "_size_t","_uint",0},
     { "_class_wxRealPoint","_wxRealPoint",0},
+    { "_wxPrinterDC","_class_wxPrinterDC",0},
     { "_class_wxPyShapeEvtHandler","_wxPyShapeEvtHandler",0},
     { "_class_wxMenuItem","_wxMenuItem",0},
     { "_class_wxPaintEvent","_wxPaintEvent",0},
     { "_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0},
     { "_class_wxStatusBar","_wxStatusBar",0},
     { "_class_wxGIFHandler","_wxGIFHandler",0},
-    { "_class_wxPostScriptDC","_wxPostScriptDC",0},
+    { "_class_wxPySizer","_wxPySizer",0},
     { "_wxPanel","_class_wxPyShapeCanvas",SwigwxPyShapeCanvasTowxPanel},
     { "_wxPanel","_wxPyShapeCanvas",SwigwxPyShapeCanvasTowxPanel},
     { "_wxPanel","_class_wxPanel",0},
@@ -2102,8 +2097,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_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},
     { "_wxPrintDialog","_class_wxPrintDialog",0},
     { "_wxPyTimer","_class_wxPyTimer",0},
     { "_wxWindowDC","_class_wxWindowDC",0},
@@ -2167,6 +2164,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_signed_int","_int",0},
     { "_class_wxTextCtrl","_wxTextCtrl",0},
     { "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
+    { "_wxMetaFileDC","_class_wxMetaFileDC",0},
     { "_wxMenu","_class_wxMenu",0},
     { "_class_wxMoveEvent","_wxMoveEvent",0},
     { "_wxListBox","_class_wxListBox",0},
@@ -2198,9 +2196,11 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_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},
+    { "_class_wxTaskBarIcon","_wxTaskBarIcon",0},
     { "_class_wxPrintDialog","_wxPrintDialog",0},
     { "_wxPaintDC","_class_wxPaintDC",0},
     { "_class_wxWindowDC","_wxWindowDC",0},
@@ -2210,7 +2210,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxToolBarTool","_wxToolBarTool",0},
     { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
     { "_class_wxCursor","_wxCursor",0},
-    { "_wxPostScriptDC","_class_wxPostScriptDC",0},
     { "_class_wxImageHandler","_wxImageHandler",0},
     { "_wxPyShape","_class_wxPyShape",0},
     { "_wxScrolledWindow","_class_wxPyShapeCanvas",SwigwxPyShapeCanvasTowxScrolledWindow},
@@ -2218,6 +2217,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxScrolledWindow","_class_wxScrolledWindow",0},
     { "_wxTreeItemId","_class_wxTreeItemId",0},
     { "_unsigned_char","_byte",0},
+    { "_class_wxMetaFileDC","_wxMetaFileDC",0},
     { "_class_wxMenu","_wxMenu",0},
     { "_wxControl","_class_wxControl",0},
     { "_class_wxListBox","_wxListBox",0},
@@ -2255,6 +2255,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_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},
@@ -2263,6 +2264,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_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},
@@ -2270,8 +2272,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxPyApp","_wxPyApp",0},
     { "_wxSize","_class_wxSize",0},
     { "_wxRegionIterator","_class_wxRegionIterator",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},
@@ -2297,6 +2301,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxRegion","_class_wxRegion",0},
     { "_class_wxSplitterWindow","_wxSplitterWindow",0},
     { "_wxPreviewFrame","_class_wxPreviewFrame",0},
+    { "_wxSizer","_class_wxSizer",0},
     { "_class_wxShowEvent","_wxShowEvent",0},
     { "_wxDiagram","_class_wxDiagram",0},
     { "_wxActivateEvent","_class_wxActivateEvent",0},

utils/wxPython/modules/ogl/oglcanvas.py

@@ -30,6 +30,8 @@ from windows3 import *
 from image import *
 
 from printfw import *
+
+from sizers import *
 import wx
 class wxDiagramPtr :
     def __init__(self,this):

utils/wxPython/modules/ogl/oglhelpers.h

@@ -155,6 +155,18 @@ public:
     WXSHAPE_DEC_CALLBACKS();
 };
 
+class wxPyControlPoint : public wxControlPoint {
+public:
+    wxPyControlPoint(wxPyShapeCanvas *the_canvas = NULL,
+                     wxPyShape *object = NULL,
+                     double size = 0.0, double the_xoffset = 0.0,
+                     double the_yoffset = 0.0, int the_type = 0)
+        : wxControlPoint(the_canvas, object, size,
+                         the_xoffset, the_yoffset, the_type) {}
+
+    WXSHAPE_DEC_CALLBACKS();
+};
+
 
 
 class wxPyBitmapShape : public wxBitmapShape {

utils/wxPython/modules/ogl/oglshapes.i

@@ -137,9 +137,59 @@ public:
     void base_OnDrawControlPoints(wxDC& dc);
     void base_OnEraseControlPoints(wxDC& dc);
     void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
-    void base_OnSizingDragLeft(wxControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginSize(double w, double h);
+    void base_OnEndSize(double w, double h);
+//    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
+};
+
+//---------------------------------------------------------------------------
+
+%{
+    WXSHAPE_IMP_CALLBACKS(wxPyControlPoint, wxControlPoint);
+%}
+
+class wxPyControlPoint : public wxPyRectangleShape {
+public:
+    wxPyControlPoint(wxPyShapeCanvas *the_canvas = NULL,
+                     wxPyShape *object = NULL,
+                     double size = 0.0, double the_xoffset = 0.0,
+                     double the_yoffset = 0.0, int the_type = 0);
+
+    void _setSelf(PyObject* self);
+    %pragma(python) addtomethod = "__init__:self._setSelf(self)"
+
+    void SetCornerRadius(double radius);
+
+    void base_OnDelete();
+    void base_OnDraw(wxDC& dc);
+    void base_OnDrawContents(wxDC& dc);
+    void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
+    void base_OnMoveLinks(wxDC& dc);
+    void base_OnErase(wxDC& dc);
+    void base_OnEraseContents(wxDC& dc);
+    void base_OnHighlight(wxDC& dc);
+    void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
+    void base_OnSize(double x, double y);
+    bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+    void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
+    void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
+    void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
+    void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
+    void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
+    void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
+    void base_OnDrawControlPoints(wxDC& dc);
+    void base_OnEraseControlPoints(wxDC& dc);
+    void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
+    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
     void base_OnBeginSize(double w, double h);
     void base_OnEndSize(double w, double h);
 //    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
@@ -187,9 +237,9 @@ public:
     void base_OnDrawControlPoints(wxDC& dc);
     void base_OnEraseControlPoints(wxDC& dc);
     void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
-    void base_OnSizingDragLeft(wxControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
     void base_OnBeginSize(double w, double h);
     void base_OnEndSize(double w, double h);
 //    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
@@ -264,9 +314,9 @@ public:
     void base_OnDrawControlPoints(wxDC& dc);
     void base_OnEraseControlPoints(wxDC& dc);
     void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
-    void base_OnSizingDragLeft(wxControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
     void base_OnBeginSize(double w, double h);
     void base_OnEndSize(double w, double h);
 //    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
@@ -376,9 +426,9 @@ public:
     void base_OnDrawControlPoints(wxDC& dc);
     void base_OnEraseControlPoints(wxDC& dc);
     void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
-    void base_OnSizingDragLeft(wxControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
     void base_OnBeginSize(double w, double h);
     void base_OnEndSize(double w, double h);
 //    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
@@ -426,9 +476,9 @@ public:
     void base_OnDrawControlPoints(wxDC& dc);
     void base_OnEraseControlPoints(wxDC& dc);
     void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
-    void base_OnSizingDragLeft(wxControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
     void base_OnBeginSize(double w, double h);
     void base_OnEndSize(double w, double h);
 //    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
@@ -500,9 +550,9 @@ public:
     void base_OnDrawControlPoints(wxDC& dc);
     void base_OnEraseControlPoints(wxDC& dc);
     void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
-    void base_OnSizingDragLeft(wxControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
     void base_OnBeginSize(double w, double h);
     void base_OnEndSize(double w, double h);
 //    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);

utils/wxPython/modules/ogl/oglshapes.py

@@ -31,6 +31,8 @@ from image import *
 
 from printfw import *
 
+from sizers import *
+
 from oglbasic import *
 import wx
 class wxPseudoMetaFilePtr :
@@ -283,6 +285,114 @@ class wxPyRectangleShape(wxPyRectangleShapePtr):
 
 
 
+class wxPyControlPointPtr(wxPyRectangleShapePtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def _setSelf(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyControlPoint__setSelf,(self,) + _args, _kwargs)
+        return val
+    def SetCornerRadius(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyControlPoint_SetCornerRadius,(self,) + _args, _kwargs)
+        return val
+    def base_OnDelete(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyControlPoint_base_OnDelete,(self,) + _args, _kwargs)
+        return val
+    def base_OnDraw(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyControlPoint_base_OnDraw,(self,) + _args, _kwargs)
+        return val
+    def base_OnDrawContents(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyControlPoint_base_OnDrawContents,(self,) + _args, _kwargs)
+        return val
+    def base_OnDrawBranches(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyControlPoint_base_OnDrawBranches,(self,) + _args, _kwargs)
+        return val
+    def base_OnMoveLinks(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyControlPoint_base_OnMoveLinks,(self,) + _args, _kwargs)
+        return val
+    def base_OnErase(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyControlPoint_base_OnErase,(self,) + _args, _kwargs)
+        return val
+    def base_OnEraseContents(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyControlPoint_base_OnEraseContents,(self,) + _args, _kwargs)
+        return val
+    def base_OnHighlight(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyControlPoint_base_OnHighlight,(self,) + _args, _kwargs)
+        return val
+    def base_OnLeftClick(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyControlPoint_base_OnLeftClick,(self,) + _args, _kwargs)
+        return val
+    def base_OnLeftDoubleClick(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyControlPoint_base_OnLeftDoubleClick,(self,) + _args, _kwargs)
+        return val
+    def base_OnRightClick(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyControlPoint_base_OnRightClick,(self,) + _args, _kwargs)
+        return val
+    def base_OnSize(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyControlPoint_base_OnSize,(self,) + _args, _kwargs)
+        return val
+    def base_OnMovePre(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyControlPoint_base_OnMovePre,(self,) + _args, _kwargs)
+        return val
+    def base_OnMovePost(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyControlPoint_base_OnMovePost,(self,) + _args, _kwargs)
+        return val
+    def base_OnDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyControlPoint_base_OnDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnBeginDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyControlPoint_base_OnBeginDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnEndDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyControlPoint_base_OnEndDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnDragRight(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyControlPoint_base_OnDragRight,(self,) + _args, _kwargs)
+        return val
+    def base_OnBeginDragRight(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyControlPoint_base_OnBeginDragRight,(self,) + _args, _kwargs)
+        return val
+    def base_OnEndDragRight(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyControlPoint_base_OnEndDragRight,(self,) + _args, _kwargs)
+        return val
+    def base_OnDrawOutline(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyControlPoint_base_OnDrawOutline,(self,) + _args, _kwargs)
+        return val
+    def base_OnDrawControlPoints(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyControlPoint_base_OnDrawControlPoints,(self,) + _args, _kwargs)
+        return val
+    def base_OnEraseControlPoints(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyControlPoint_base_OnEraseControlPoints,(self,) + _args, _kwargs)
+        return val
+    def base_OnMoveLink(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyControlPoint_base_OnMoveLink,(self,) + _args, _kwargs)
+        return val
+    def base_OnSizingDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyControlPoint_base_OnSizingDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnSizingBeginDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyControlPoint_base_OnSizingBeginDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnSizingEndDragLeft(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyControlPoint_base_OnSizingEndDragLeft,(self,) + _args, _kwargs)
+        return val
+    def base_OnBeginSize(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyControlPoint_base_OnBeginSize,(self,) + _args, _kwargs)
+        return val
+    def base_OnEndSize(self, *_args, **_kwargs):
+        val = apply(oglshapesc.wxPyControlPoint_base_OnEndSize,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxPyControlPoint instance at %s>" % (self.this,)
+class wxPyControlPoint(wxPyControlPointPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(oglshapesc.new_wxPyControlPoint,_args,_kwargs)
+        self.thisown = 1
+        self._setSelf(self)
+
+
+
+
 class wxPyBitmapShapePtr(wxPyRectangleShapePtr):
     def __init__(self,this):
         self.this = this

utils/wxPython/modules/ogl/oglshapes2.cpp

@@ -1,5 +1,5 @@
 /*
- * FILE : oglshapes2.cpp
+ * FILE : ./oglshapes2.cpp
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
@@ -103,17 +103,6 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     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(wxPyEllipseShape, wxEllipseShape);
@@ -1013,7 +1002,7 @@ static PyObject *_wrap_wxPyEllipseShape_base_OnMoveLink(PyObject *self, PyObject
 static PyObject *_wrap_wxPyEllipseShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyEllipseShape * _arg0;
-    wxControlPoint * _arg1;
+    wxPyControlPoint * _arg1;
     bool  _arg2;
     double  _arg3;
     double  _arg4;
@@ -1036,8 +1025,8 @@ static PyObject *_wrap_wxPyEllipseShape_base_OnSizingDragLeft(PyObject *self, Py
     }
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
-        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxControlPoint_p")) {
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyEllipseShape_base_OnSizingDragLeft. Expected _wxControlPoint_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyEllipseShape_base_OnSizingDragLeft. Expected _wxPyControlPoint_p.");
         return NULL;
         }
     }
@@ -1056,7 +1045,7 @@ static PyObject *_wrap_wxPyEllipseShape_base_OnSizingDragLeft(PyObject *self, Py
 static PyObject *_wrap_wxPyEllipseShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyEllipseShape * _arg0;
-    wxControlPoint * _arg1;
+    wxPyControlPoint * _arg1;
     double  _arg2;
     double  _arg3;
     int  _arg4 = (int ) 0;
@@ -1077,8 +1066,8 @@ static PyObject *_wrap_wxPyEllipseShape_base_OnSizingBeginDragLeft(PyObject *sel
     }
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
-        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxControlPoint_p")) {
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyEllipseShape_base_OnSizingBeginDragLeft. Expected _wxControlPoint_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyEllipseShape_base_OnSizingBeginDragLeft. Expected _wxPyControlPoint_p.");
         return NULL;
         }
     }
@@ -1096,7 +1085,7 @@ static PyObject *_wrap_wxPyEllipseShape_base_OnSizingBeginDragLeft(PyObject *sel
 static PyObject *_wrap_wxPyEllipseShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyEllipseShape * _arg0;
-    wxControlPoint * _arg1;
+    wxPyControlPoint * _arg1;
     double  _arg2;
     double  _arg3;
     int  _arg4 = (int ) 0;
@@ -1117,8 +1106,8 @@ static PyObject *_wrap_wxPyEllipseShape_base_OnSizingEndDragLeft(PyObject *self,
     }
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
-        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxControlPoint_p")) {
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyEllipseShape_base_OnSizingEndDragLeft. Expected _wxControlPoint_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyEllipseShape_base_OnSizingEndDragLeft. Expected _wxPyControlPoint_p.");
         return NULL;
         }
     }
@@ -2082,7 +2071,7 @@ static PyObject *_wrap_wxPyCircleShape_base_OnMoveLink(PyObject *self, PyObject
 static PyObject *_wrap_wxPyCircleShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyCircleShape * _arg0;
-    wxControlPoint * _arg1;
+    wxPyControlPoint * _arg1;
     bool  _arg2;
     double  _arg3;
     double  _arg4;
@@ -2105,8 +2094,8 @@ static PyObject *_wrap_wxPyCircleShape_base_OnSizingDragLeft(PyObject *self, PyO
     }
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
-        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxControlPoint_p")) {
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyCircleShape_base_OnSizingDragLeft. Expected _wxControlPoint_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyCircleShape_base_OnSizingDragLeft. Expected _wxPyControlPoint_p.");
         return NULL;
         }
     }
@@ -2125,7 +2114,7 @@ static PyObject *_wrap_wxPyCircleShape_base_OnSizingDragLeft(PyObject *self, PyO
 static PyObject *_wrap_wxPyCircleShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyCircleShape * _arg0;
-    wxControlPoint * _arg1;
+    wxPyControlPoint * _arg1;
     double  _arg2;
     double  _arg3;
     int  _arg4 = (int ) 0;
@@ -2146,8 +2135,8 @@ static PyObject *_wrap_wxPyCircleShape_base_OnSizingBeginDragLeft(PyObject *self
     }
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
-        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxControlPoint_p")) {
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyCircleShape_base_OnSizingBeginDragLeft. Expected _wxControlPoint_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyCircleShape_base_OnSizingBeginDragLeft. Expected _wxPyControlPoint_p.");
         return NULL;
         }
     }
@@ -2165,7 +2154,7 @@ static PyObject *_wrap_wxPyCircleShape_base_OnSizingBeginDragLeft(PyObject *self
 static PyObject *_wrap_wxPyCircleShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyCircleShape * _arg0;
-    wxControlPoint * _arg1;
+    wxPyControlPoint * _arg1;
     double  _arg2;
     double  _arg3;
     int  _arg4 = (int ) 0;
@@ -2186,8 +2175,8 @@ static PyObject *_wrap_wxPyCircleShape_base_OnSizingEndDragLeft(PyObject *self,
     }
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
-        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxControlPoint_p")) {
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyCircleShape_base_OnSizingEndDragLeft. Expected _wxControlPoint_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyCircleShape_base_OnSizingEndDragLeft. Expected _wxPyControlPoint_p.");
         return NULL;
         }
     }
@@ -5099,7 +5088,7 @@ static PyObject *_wrap_wxPyLineShape_base_OnMoveLink(PyObject *self, PyObject *a
 static PyObject *_wrap_wxPyLineShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyLineShape * _arg0;
-    wxControlPoint * _arg1;
+    wxPyControlPoint * _arg1;
     bool  _arg2;
     double  _arg3;
     double  _arg4;
@@ -5122,8 +5111,8 @@ static PyObject *_wrap_wxPyLineShape_base_OnSizingDragLeft(PyObject *self, PyObj
     }
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
-        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxControlPoint_p")) {
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyLineShape_base_OnSizingDragLeft. Expected _wxControlPoint_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyLineShape_base_OnSizingDragLeft. Expected _wxPyControlPoint_p.");
         return NULL;
         }
     }
@@ -5142,7 +5131,7 @@ static PyObject *_wrap_wxPyLineShape_base_OnSizingDragLeft(PyObject *self, PyObj
 static PyObject *_wrap_wxPyLineShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyLineShape * _arg0;
-    wxControlPoint * _arg1;
+    wxPyControlPoint * _arg1;
     double  _arg2;
     double  _arg3;
     int  _arg4 = (int ) 0;
@@ -5163,8 +5152,8 @@ static PyObject *_wrap_wxPyLineShape_base_OnSizingBeginDragLeft(PyObject *self,
     }
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
-        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxControlPoint_p")) {
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyLineShape_base_OnSizingBeginDragLeft. Expected _wxControlPoint_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyLineShape_base_OnSizingBeginDragLeft. Expected _wxPyControlPoint_p.");
         return NULL;
         }
     }
@@ -5182,7 +5171,7 @@ static PyObject *_wrap_wxPyLineShape_base_OnSizingBeginDragLeft(PyObject *self,
 static PyObject *_wrap_wxPyLineShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyLineShape * _arg0;
-    wxControlPoint * _arg1;
+    wxPyControlPoint * _arg1;
     double  _arg2;
     double  _arg3;
     int  _arg4 = (int ) 0;
@@ -5203,8 +5192,8 @@ static PyObject *_wrap_wxPyLineShape_base_OnSizingEndDragLeft(PyObject *self, Py
     }
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
-        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxControlPoint_p")) {
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyLineShape_base_OnSizingEndDragLeft. Expected _wxControlPoint_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyLineShape_base_OnSizingEndDragLeft. Expected _wxPyControlPoint_p.");
         return NULL;
         }
     }
@@ -6343,7 +6332,7 @@ static PyObject *_wrap_wxPyPolygonShape_base_OnMoveLink(PyObject *self, PyObject
 static PyObject *_wrap_wxPyPolygonShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyPolygonShape * _arg0;
-    wxControlPoint * _arg1;
+    wxPyControlPoint * _arg1;
     bool  _arg2;
     double  _arg3;
     double  _arg4;
@@ -6366,8 +6355,8 @@ static PyObject *_wrap_wxPyPolygonShape_base_OnSizingDragLeft(PyObject *self, Py
     }
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
-        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxControlPoint_p")) {
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyPolygonShape_base_OnSizingDragLeft. Expected _wxControlPoint_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyPolygonShape_base_OnSizingDragLeft. Expected _wxPyControlPoint_p.");
         return NULL;
         }
     }
@@ -6386,7 +6375,7 @@ static PyObject *_wrap_wxPyPolygonShape_base_OnSizingDragLeft(PyObject *self, Py
 static PyObject *_wrap_wxPyPolygonShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyPolygonShape * _arg0;
-    wxControlPoint * _arg1;
+    wxPyControlPoint * _arg1;
     double  _arg2;
     double  _arg3;
     int  _arg4 = (int ) 0;
@@ -6407,8 +6396,8 @@ static PyObject *_wrap_wxPyPolygonShape_base_OnSizingBeginDragLeft(PyObject *sel
     }
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
-        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxControlPoint_p")) {
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyPolygonShape_base_OnSizingBeginDragLeft. Expected _wxControlPoint_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyPolygonShape_base_OnSizingBeginDragLeft. Expected _wxPyControlPoint_p.");
         return NULL;
         }
     }
@@ -6426,7 +6415,7 @@ static PyObject *_wrap_wxPyPolygonShape_base_OnSizingBeginDragLeft(PyObject *sel
 static PyObject *_wrap_wxPyPolygonShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyPolygonShape * _arg0;
-    wxControlPoint * _arg1;
+    wxPyControlPoint * _arg1;
     double  _arg2;
     double  _arg3;
     int  _arg4 = (int ) 0;
@@ -6447,8 +6436,8 @@ static PyObject *_wrap_wxPyPolygonShape_base_OnSizingEndDragLeft(PyObject *self,
     }
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
-        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxControlPoint_p")) {
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyPolygonShape_base_OnSizingEndDragLeft. Expected _wxControlPoint_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyPolygonShape_base_OnSizingEndDragLeft. Expected _wxPyControlPoint_p.");
         return NULL;
         }
     }
@@ -7440,7 +7429,7 @@ static PyObject *_wrap_wxPyTextShape_base_OnMoveLink(PyObject *self, PyObject *a
 static PyObject *_wrap_wxPyTextShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyTextShape * _arg0;
-    wxControlPoint * _arg1;
+    wxPyControlPoint * _arg1;
     bool  _arg2;
     double  _arg3;
     double  _arg4;
@@ -7463,8 +7452,8 @@ static PyObject *_wrap_wxPyTextShape_base_OnSizingDragLeft(PyObject *self, PyObj
     }
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
-        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxControlPoint_p")) {
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyTextShape_base_OnSizingDragLeft. Expected _wxControlPoint_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyTextShape_base_OnSizingDragLeft. Expected _wxPyControlPoint_p.");
         return NULL;
         }
     }
@@ -7483,7 +7472,7 @@ static PyObject *_wrap_wxPyTextShape_base_OnSizingDragLeft(PyObject *self, PyObj
 static PyObject *_wrap_wxPyTextShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyTextShape * _arg0;
-    wxControlPoint * _arg1;
+    wxPyControlPoint * _arg1;
     double  _arg2;
     double  _arg3;
     int  _arg4 = (int ) 0;
@@ -7504,8 +7493,8 @@ static PyObject *_wrap_wxPyTextShape_base_OnSizingBeginDragLeft(PyObject *self,
     }
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
-        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxControlPoint_p")) {
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyTextShape_base_OnSizingBeginDragLeft. Expected _wxControlPoint_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyTextShape_base_OnSizingBeginDragLeft. Expected _wxPyControlPoint_p.");
         return NULL;
         }
     }
@@ -7523,7 +7512,7 @@ static PyObject *_wrap_wxPyTextShape_base_OnSizingBeginDragLeft(PyObject *self,
 static PyObject *_wrap_wxPyTextShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyTextShape * _arg0;
-    wxControlPoint * _arg1;
+    wxPyControlPoint * _arg1;
     double  _arg2;
     double  _arg3;
     int  _arg4 = (int ) 0;
@@ -7544,8 +7533,8 @@ static PyObject *_wrap_wxPyTextShape_base_OnSizingEndDragLeft(PyObject *self, Py
     }
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
-        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxControlPoint_p")) {
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyTextShape_base_OnSizingEndDragLeft. Expected _wxControlPoint_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyTextShape_base_OnSizingEndDragLeft. Expected _wxPyControlPoint_p.");
         return NULL;
         }
     }
@@ -7847,6 +7836,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_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},
@@ -7861,9 +7851,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_wxStaticBoxSizer","_wxStaticBoxSizer",0},
     { "_class_wxEvtHandler","_wxEvtHandler",0},
     { "_wxPaintEvent","_class_wxPaintEvent",0},
     { "_wxGIFHandler","_class_wxGIFHandler",0},
+    { "_wxPySizer","_class_wxPySizer",0},
     { "_wxPyCompositeShape","_class_wxPyCompositeShape",0},
     { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
     { "_wxCursor","_class_wxCursor",0},
@@ -7899,11 +7891,13 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_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},
+    { "_wxSizerItem","_class_wxSizerItem",0},
     { "_wxListEvent","_class_wxListEvent",0},
     { "_class_wxSingleChoiceDialog","_wxSingleChoiceDialog",0},
     { "_wxProgressDialog","_class_wxProgressDialog",0},
@@ -7921,6 +7915,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_size_t","_wxWindowID",0},
     { "_size_t","_uint",0},
     { "_class_wxRealPoint","_wxRealPoint",0},
+    { "_wxPrinterDC","_class_wxPrinterDC",0},
     { "_class_wxPyShapeEvtHandler","_class_wxPyTextShape",SwigwxPyTextShapeTowxPyShapeEvtHandler},
     { "_class_wxPyShapeEvtHandler","_wxPyTextShape",SwigwxPyTextShapeTowxPyShapeEvtHandler},
     { "_class_wxPyShapeEvtHandler","_class_wxPyPolygonShape",SwigwxPyPolygonShapeTowxPyShapeEvtHandler},
@@ -7937,9 +7932,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0},
     { "_class_wxStatusBar","_wxStatusBar",0},
     { "_class_wxGIFHandler","_wxGIFHandler",0},
+    { "_class_wxPySizer","_wxPySizer",0},
     { "_class_wxPyCompositeShape","_wxPyCompositeShape",0},
     { "_wxPyPolygonShape","_class_wxPyPolygonShape",0},
-    { "_class_wxPostScriptDC","_wxPostScriptDC",0},
     { "_wxPanel","_class_wxPanel",0},
     { "_wxInitDialogEvent","_class_wxInitDialogEvent",0},
     { "_wxCheckBox","_class_wxCheckBox",0},
@@ -7985,9 +7980,12 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_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},
     { "_wxPrintDialog","_class_wxPrintDialog",0},
+    { "_wxPyControlPoint","_class_wxPyControlPoint",0},
     { "_wxPyTimer","_class_wxPyTimer",0},
     { "_wxWindowDC","_class_wxWindowDC",0},
     { "_wxScrollBar","_class_wxScrollBar",0},
@@ -8052,6 +8050,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_signed_int","_int",0},
     { "_class_wxTextCtrl","_wxTextCtrl",0},
     { "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
+    { "_wxMetaFileDC","_class_wxMetaFileDC",0},
     { "_wxMenu","_class_wxMenu",0},
     { "_class_wxMoveEvent","_wxMoveEvent",0},
     { "_wxListBox","_class_wxListBox",0},
@@ -8084,10 +8083,13 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_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},
+    { "_class_wxTaskBarIcon","_wxTaskBarIcon",0},
     { "_class_wxPrintDialog","_wxPrintDialog",0},
+    { "_class_wxPyControlPoint","_wxPyControlPoint",0},
     { "_wxPaintDC","_class_wxPaintDC",0},
     { "_class_wxWindowDC","_wxWindowDC",0},
     { "_class_wxFocusEvent","_wxFocusEvent",0},
@@ -8096,7 +8098,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxToolBarTool","_wxToolBarTool",0},
     { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
     { "_class_wxCursor","_wxCursor",0},
-    { "_wxPostScriptDC","_class_wxPostScriptDC",0},
     { "_class_wxImageHandler","_wxImageHandler",0},
     { "_wxPyShape","_class_wxPyTextShape",SwigwxPyTextShapeTowxPyShape},
     { "_wxPyShape","_wxPyTextShape",SwigwxPyTextShapeTowxPyShape},
@@ -8112,6 +8113,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxScrolledWindow","_class_wxScrolledWindow",0},
     { "_wxTreeItemId","_class_wxTreeItemId",0},
     { "_unsigned_char","_byte",0},
+    { "_class_wxMetaFileDC","_wxMetaFileDC",0},
     { "_class_wxMenu","_wxMenu",0},
     { "_wxControl","_class_wxControl",0},
     { "_class_wxListBox","_wxListBox",0},
@@ -8151,6 +8153,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_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},
@@ -8159,6 +8162,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_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},
@@ -8166,8 +8170,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxPyApp","_wxPyApp",0},
     { "_wxSize","_class_wxSize",0},
     { "_wxRegionIterator","_class_wxRegionIterator",0},
+    { "_class_wxPrinterDC","_wxPrinterDC",0},
     { "_class_wxMDIParentFrame","_wxMDIParentFrame",0},
     { "_wxPyTreeItemData","_class_wxPyTreeItemData",0},
+    { "_wxStaticBoxSizer","_class_wxStaticBoxSizer",0},
     { "_class_wxPyLineShape","_wxPyLineShape",0},
     { "_class_wxPaintDC","_wxPaintDC",0},
     { "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0},
@@ -8205,6 +8211,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_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},

utils/wxPython/modules/ogl/oglshapes2.i

@@ -73,9 +73,9 @@ public:
     void base_OnDrawControlPoints(wxDC& dc);
     void base_OnEraseControlPoints(wxDC& dc);
     void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
-    void base_OnSizingDragLeft(wxControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
     void base_OnBeginSize(double w, double h);
     void base_OnEndSize(double w, double h);
 //    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
@@ -116,9 +116,9 @@ public:
     void base_OnDrawControlPoints(wxDC& dc);
     void base_OnEraseControlPoints(wxDC& dc);
     void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
-    void base_OnSizingDragLeft(wxControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
     void base_OnBeginSize(double w, double h);
     void base_OnEndSize(double w, double h);
 //    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
@@ -242,9 +242,9 @@ public:
     void base_OnDrawControlPoints(wxDC& dc);
     void base_OnEraseControlPoints(wxDC& dc);
     void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
-    void base_OnSizingDragLeft(wxControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
     void base_OnBeginSize(double w, double h);
     void base_OnEndSize(double w, double h);
 //    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
@@ -314,9 +314,9 @@ public:
     void base_OnDrawControlPoints(wxDC& dc);
     void base_OnEraseControlPoints(wxDC& dc);
     void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
-    void base_OnSizingDragLeft(wxControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
     void base_OnBeginSize(double w, double h);
     void base_OnEndSize(double w, double h);
 //    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
@@ -358,9 +358,9 @@ public:
     void base_OnDrawControlPoints(wxDC& dc);
     void base_OnEraseControlPoints(wxDC& dc);
     void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
-    void base_OnSizingDragLeft(wxControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
+    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
     void base_OnBeginSize(double w, double h);
     void base_OnEndSize(double w, double h);
 //    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);

utils/wxPython/modules/ogl/oglshapes2.py

@@ -31,6 +31,8 @@ from image import *
 
 from printfw import *
 
+from sizers import *
+
 from oglbasic import *
 
 from oglshapes import *