From 2348eaee20040cd087f4584bd5d818cba7fc1463 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 30 Sep 1999 06:58:38 +0000 Subject: [PATCH] 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 | 4 +- utils/wxPython/modules/ogl/_ogldefs.i | 2 + utils/wxPython/modules/ogl/ogl.cpp | 35 +- utils/wxPython/modules/ogl/ogl.py | 6 +- utils/wxPython/modules/ogl/oglbasic.cpp | 207 ++- utils/wxPython/modules/ogl/oglbasic.i | 12 +- utils/wxPython/modules/ogl/oglbasic.py | 2 + utils/wxPython/modules/ogl/oglcanvas.cpp | 63 +- utils/wxPython/modules/ogl/oglcanvas.py | 2 + utils/wxPython/modules/ogl/oglhelpers.h | 12 + utils/wxPython/modules/ogl/oglshapes.cpp | 1897 +++++++++++++++++---- utils/wxPython/modules/ogl/oglshapes.i | 86 +- utils/wxPython/modules/ogl/oglshapes.py | 110 ++ utils/wxPython/modules/ogl/oglshapes2.cpp | 125 +- utils/wxPython/modules/ogl/oglshapes2.i | 30 +- utils/wxPython/modules/ogl/oglshapes2.py | 2 + 16 files changed, 1983 insertions(+), 612 deletions(-) diff --git a/utils/wxPython/modules/ogl/_extras.py b/utils/wxPython/modules/ogl/_extras.py index 91f90732d9..d5309e4a5b 100644 --- a/utils/wxPython/modules/ogl/_extras.py +++ b/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 diff --git a/utils/wxPython/modules/ogl/_ogldefs.i b/utils/wxPython/modules/ogl/_ogldefs.i index 1ecc3f8581..b71d0e8962 100644 --- a/utils/wxPython/modules/ogl/_ogldefs.i +++ b/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; //--------------------------------------------------------------------------- diff --git a/utils/wxPython/modules/ogl/ogl.cpp b/utils/wxPython/modules/ogl/ogl.cpp index 4163a881e0..6beb65ff4f 100644 --- a/utils/wxPython/modules/ogl/ogl.cpp +++ b/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}, diff --git a/utils/wxPython/modules/ogl/ogl.py b/utils/wxPython/modules/ogl/ogl.py index 3a1b62b323..8a478c5ba7 100644 --- a/utils/wxPython/modules/ogl/ogl.py +++ b/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 diff --git a/utils/wxPython/modules/ogl/oglbasic.cpp b/utils/wxPython/modules/ogl/oglbasic.cpp index 1c0ba524f1..462eeb6fa7 100644 --- a/utils/wxPython/modules/ogl/oglbasic.cpp +++ b/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")) { - 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; } } @@ -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")) { - 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; } } @@ -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")) { - 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; } } @@ -5946,14 +5935,16 @@ static PyObject *_wrap_wxPyShape_CalcSimpleAttachment(PyObject *self, PyObject * 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; - 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; } - 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; - } - } - 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; - } - } +} 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; - PyObject * _argo3 = 0; + wxRealPoint temp; + 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; } - 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; - } - } - 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; - } - } +} { 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; - 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; - 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; } - 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; - } - } - 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; - } - } - 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; - } - } - 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; - } - } +} { 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; - PyObject * _argo4 = 0; + wxRealPoint temp; + 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; } - 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; - } - } - 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; - } - } +} { 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")) { - 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; } } @@ -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")) { - 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; } } @@ -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")) { - 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; } } @@ -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}, diff --git a/utils/wxPython/modules/ogl/oglbasic.i b/utils/wxPython/modules/ogl/oglbasic.i index ffa9360cb3..8c05fd7651 100644 --- a/utils/wxPython/modules/ogl/oglbasic.i +++ b/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_OnSizingBeginDragLeft(wxControlPoint* 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_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); @@ -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_OnSizingBeginDragLeft(wxControlPoint* 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_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); diff --git a/utils/wxPython/modules/ogl/oglbasic.py b/utils/wxPython/modules/ogl/oglbasic.py index cc3a523383..4ad4961873 100644 --- a/utils/wxPython/modules/ogl/oglbasic.py +++ b/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 : diff --git a/utils/wxPython/modules/ogl/oglcanvas.cpp b/utils/wxPython/modules/ogl/oglcanvas.cpp index 27778fa1ba..274b3c88db 100644 --- a/utils/wxPython/modules/ogl/oglcanvas.cpp +++ b/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; - PyObject * _argo3 = 0; + wxPoint temp; + 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 (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxPyShapeCanvas. Expected _wxPoint_p."); + if (_obj2) +{ + _arg2 = &temp; + if (! wxPoint_helper(_obj2, &_arg2)) return NULL; - } - } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxPyShapeCanvas. Expected _wxSize_p."); +} + if (_obj3) +{ + _arg3 = &temp0; + if (! wxSize_helper(_obj3, &_arg3)) 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}, diff --git a/utils/wxPython/modules/ogl/oglcanvas.py b/utils/wxPython/modules/ogl/oglcanvas.py index 16b14b20b1..91349c945c 100644 --- a/utils/wxPython/modules/ogl/oglcanvas.py +++ b/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): diff --git a/utils/wxPython/modules/ogl/oglhelpers.h b/utils/wxPython/modules/ogl/oglhelpers.h index 631a7318da..f9bd936916 100644 --- a/utils/wxPython/modules/ogl/oglhelpers.h +++ b/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 { diff --git a/utils/wxPython/modules/ogl/oglshapes.cpp b/utils/wxPython/modules/ogl/oglshapes.cpp index 9ec270710f..9be7d8497d 100644 --- a/utils/wxPython/modules/ogl/oglshapes.cpp +++ b/utils/wxPython/modules/ogl/oglshapes.cpp @@ -1,5 +1,5 @@ /* - * FILE : oglshapes.cpp + * FILE : ./oglshapes.cpp * * This file was automatically generated by : * Simplified Wrapper and Interface Generator (SWIG) @@ -103,21 +103,12 @@ 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(wxPyRectangleShape, wxRectangleShape); + WXSHAPE_IMP_CALLBACKS(wxPyControlPoint, wxControlPoint); + WXSHAPE_IMP_CALLBACKS(wxPyBitmapShape, wxBitmapShape); WXSHAPE_IMP_CALLBACKS(wxPyDrawnShape, wxDrawnShape); @@ -934,12 +925,14 @@ static PyObject *_wrap_wxPseudoMetaFile_DrawLine(PyObject *self, PyObject *args, wxPoint * _arg1; wxPoint * _arg2; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - PyObject * _argo2 = 0; + wxPoint temp; + PyObject * _obj1 = 0; + wxPoint temp0; + PyObject * _obj2 = 0; char *_kwnames[] = { "self","pt1","pt2", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPseudoMetaFile_DrawLine",_kwnames,&_argo0,&_argo1,&_argo2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPseudoMetaFile_DrawLine",_kwnames,&_argo0,&_obj1,&_obj2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -948,20 +941,16 @@ static PyObject *_wrap_wxPseudoMetaFile_DrawLine(PyObject *self, PyObject *args, return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPseudoMetaFile_DrawLine. Expected _wxPoint_p."); +{ + _arg1 = &temp; + if (! wxPoint_helper(_obj1, &_arg1)) return NULL; - } - } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxPseudoMetaFile_DrawLine. Expected _wxPoint_p."); +} +{ + _arg2 = &temp0; + if (! wxPoint_helper(_obj2, &_arg2)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxPseudoMetaFile_DrawLine(_arg0,*_arg1,*_arg2); @@ -978,11 +967,12 @@ static PyObject *_wrap_wxPseudoMetaFile_DrawRectangle(PyObject *self, PyObject * wxPseudoMetaFile * _arg0; wxRect * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxRect temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","rect", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPseudoMetaFile_DrawRectangle",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPseudoMetaFile_DrawRectangle",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -991,13 +981,11 @@ static PyObject *_wrap_wxPseudoMetaFile_DrawRectangle(PyObject *self, PyObject * return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPseudoMetaFile_DrawRectangle. Expected _wxRect_p."); +{ + _arg1 = &temp; + if (! wxRect_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxPseudoMetaFile_DrawRectangle(_arg0,*_arg1); @@ -1015,11 +1003,12 @@ static PyObject *_wrap_wxPseudoMetaFile_DrawRoundedRectangle(PyObject *self, PyO wxRect * _arg1; double _arg2; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxRect temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","rect","radius", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOd:wxPseudoMetaFile_DrawRoundedRectangle",_kwnames,&_argo0,&_argo1,&_arg2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOd:wxPseudoMetaFile_DrawRoundedRectangle",_kwnames,&_argo0,&_obj1,&_arg2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1028,13 +1017,11 @@ static PyObject *_wrap_wxPseudoMetaFile_DrawRoundedRectangle(PyObject *self, PyO return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPseudoMetaFile_DrawRoundedRectangle. Expected _wxRect_p."); +{ + _arg1 = &temp; + if (! wxRect_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxPseudoMetaFile_DrawRoundedRectangle(_arg0,*_arg1,_arg2); @@ -1053,13 +1040,16 @@ static PyObject *_wrap_wxPseudoMetaFile_DrawArc(PyObject *self, PyObject *args, wxPoint * _arg2; wxPoint * _arg3; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - PyObject * _argo2 = 0; - PyObject * _argo3 = 0; + wxPoint temp; + PyObject * _obj1 = 0; + wxPoint temp0; + PyObject * _obj2 = 0; + wxPoint temp1; + PyObject * _obj3 = 0; char *_kwnames[] = { "self","centrePt","startPt","endPt", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOO:wxPseudoMetaFile_DrawArc",_kwnames,&_argo0,&_argo1,&_argo2,&_argo3)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOO:wxPseudoMetaFile_DrawArc",_kwnames,&_argo0,&_obj1,&_obj2,&_obj3)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1068,27 +1058,21 @@ static PyObject *_wrap_wxPseudoMetaFile_DrawArc(PyObject *self, PyObject *args, return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPseudoMetaFile_DrawArc. Expected _wxPoint_p."); +{ + _arg1 = &temp; + if (! wxPoint_helper(_obj1, &_arg1)) return NULL; - } - } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxPseudoMetaFile_DrawArc. Expected _wxPoint_p."); +} +{ + _arg2 = &temp0; + if (! wxPoint_helper(_obj2, &_arg2)) return NULL; - } - } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxPseudoMetaFile_DrawArc. Expected _wxPoint_p."); +} +{ + _arg3 = &temp1; + if (! wxPoint_helper(_obj3, &_arg3)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxPseudoMetaFile_DrawArc(_arg0,*_arg1,*_arg2,*_arg3); @@ -1107,11 +1091,12 @@ static PyObject *_wrap_wxPseudoMetaFile_DrawEllipticArc(PyObject *self, PyObject double _arg2; double _arg3; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxRect temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","rect","startAngle","endAngle", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOdd:wxPseudoMetaFile_DrawEllipticArc",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOdd:wxPseudoMetaFile_DrawEllipticArc",_kwnames,&_argo0,&_obj1,&_arg2,&_arg3)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1120,13 +1105,11 @@ static PyObject *_wrap_wxPseudoMetaFile_DrawEllipticArc(PyObject *self, PyObject return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPseudoMetaFile_DrawEllipticArc. Expected _wxRect_p."); +{ + _arg1 = &temp; + if (! wxRect_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxPseudoMetaFile_DrawEllipticArc(_arg0,*_arg1,_arg2,_arg3); @@ -1143,11 +1126,12 @@ static PyObject *_wrap_wxPseudoMetaFile_DrawEllipse(PyObject *self, PyObject *ar wxPseudoMetaFile * _arg0; wxRect * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxRect temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","rect", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPseudoMetaFile_DrawEllipse",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPseudoMetaFile_DrawEllipse",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1156,13 +1140,11 @@ static PyObject *_wrap_wxPseudoMetaFile_DrawEllipse(PyObject *self, PyObject *ar return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPseudoMetaFile_DrawEllipse. Expected _wxRect_p."); +{ + _arg1 = &temp; + if (! wxRect_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxPseudoMetaFile_DrawEllipse(_arg0,*_arg1); @@ -1179,11 +1161,12 @@ static PyObject *_wrap_wxPseudoMetaFile_DrawPoint(PyObject *self, PyObject *args wxPseudoMetaFile * _arg0; wxPoint * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxPoint temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","pt", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPseudoMetaFile_DrawPoint",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPseudoMetaFile_DrawPoint",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1192,13 +1175,11 @@ static PyObject *_wrap_wxPseudoMetaFile_DrawPoint(PyObject *self, PyObject *args return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPseudoMetaFile_DrawPoint. Expected _wxPoint_p."); +{ + _arg1 = &temp; + if (! wxPoint_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxPseudoMetaFile_DrawPoint(_arg0,*_arg1); @@ -1217,11 +1198,12 @@ static PyObject *_wrap_wxPseudoMetaFile_DrawText(PyObject *self, PyObject *args, wxPoint * _arg2; PyObject * _argo0 = 0; PyObject * _obj1 = 0; - PyObject * _argo2 = 0; + wxPoint temp; + PyObject * _obj2 = 0; char *_kwnames[] = { "self","text","pt", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPseudoMetaFile_DrawText",_kwnames,&_argo0,&_obj1,&_argo2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPseudoMetaFile_DrawText",_kwnames,&_argo0,&_obj1,&_obj2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1237,13 +1219,11 @@ static PyObject *_wrap_wxPseudoMetaFile_DrawText(PyObject *self, PyObject *args, } _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1)); } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxPseudoMetaFile_DrawText. Expected _wxPoint_p."); +{ + _arg2 = &temp; + if (! wxPoint_helper(_obj2, &_arg2)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxPseudoMetaFile_DrawText(_arg0,*_arg1,*_arg2); @@ -1409,11 +1389,12 @@ static PyObject *_wrap_wxPseudoMetaFile_SetClippingRect(PyObject *self, PyObject wxPseudoMetaFile * _arg0; wxRect * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxRect temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","rect", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPseudoMetaFile_SetClippingRect",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPseudoMetaFile_SetClippingRect",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1422,13 +1403,11 @@ static PyObject *_wrap_wxPseudoMetaFile_SetClippingRect(PyObject *self, PyObject return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPseudoMetaFile_SetClippingRect. Expected _wxRect_p."); +{ + _arg1 = &temp; + if (! wxRect_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxPseudoMetaFile_SetClippingRect(_arg0,*_arg1); @@ -2620,7 +2599,7 @@ static PyObject *_wrap_wxPyRectangleShape_base_OnMoveLink(PyObject *self, PyObje static PyObject *_wrap_wxPyRectangleShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPyRectangleShape * _arg0; - wxControlPoint * _arg1; + wxPyControlPoint * _arg1; bool _arg2; double _arg3; double _arg4; @@ -2643,8 +2622,8 @@ static PyObject *_wrap_wxPyRectangleShape_base_OnSizingDragLeft(PyObject *self, } 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 wxPyRectangleShape_base_OnSizingDragLeft. Expected _wxControlPoint_p."); + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyRectangleShape_base_OnSizingDragLeft. Expected _wxPyControlPoint_p."); return NULL; } } @@ -2663,7 +2642,7 @@ static PyObject *_wrap_wxPyRectangleShape_base_OnSizingDragLeft(PyObject *self, static PyObject *_wrap_wxPyRectangleShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPyRectangleShape * _arg0; - wxControlPoint * _arg1; + wxPyControlPoint * _arg1; double _arg2; double _arg3; int _arg4 = (int ) 0; @@ -2684,8 +2663,8 @@ static PyObject *_wrap_wxPyRectangleShape_base_OnSizingBeginDragLeft(PyObject *s } 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 wxPyRectangleShape_base_OnSizingBeginDragLeft. Expected _wxControlPoint_p."); + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyRectangleShape_base_OnSizingBeginDragLeft. Expected _wxPyControlPoint_p."); return NULL; } } @@ -2703,7 +2682,7 @@ static PyObject *_wrap_wxPyRectangleShape_base_OnSizingBeginDragLeft(PyObject *s static PyObject *_wrap_wxPyRectangleShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPyRectangleShape * _arg0; - wxControlPoint * _arg1; + wxPyControlPoint * _arg1; double _arg2; double _arg3; int _arg4 = (int ) 0; @@ -2724,8 +2703,8 @@ static PyObject *_wrap_wxPyRectangleShape_base_OnSizingEndDragLeft(PyObject *sel } 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 wxPyRectangleShape_base_OnSizingEndDragLeft. Expected _wxControlPoint_p."); + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyRectangleShape_base_OnSizingEndDragLeft. Expected _wxPyControlPoint_p."); return NULL; } } @@ -2797,47 +2776,69 @@ static PyObject *_wrap_wxPyRectangleShape_base_OnEndSize(PyObject *self, PyObjec return _resultobj; } -static void *SwigwxPyBitmapShapeTowxPyRectangleShape(void *ptr) { - wxPyBitmapShape *src; +static void *SwigwxPyControlPointTowxPyRectangleShape(void *ptr) { + wxPyControlPoint *src; wxPyRectangleShape *dest; - src = (wxPyBitmapShape *) ptr; + src = (wxPyControlPoint *) ptr; dest = (wxPyRectangleShape *) src; return (void *) dest; } -static void *SwigwxPyBitmapShapeTowxPyShape(void *ptr) { - wxPyBitmapShape *src; +static void *SwigwxPyControlPointTowxPyShape(void *ptr) { + wxPyControlPoint *src; wxPyShape *dest; - src = (wxPyBitmapShape *) ptr; + src = (wxPyControlPoint *) ptr; dest = (wxPyShape *) src; return (void *) dest; } -static void *SwigwxPyBitmapShapeTowxPyShapeEvtHandler(void *ptr) { - wxPyBitmapShape *src; +static void *SwigwxPyControlPointTowxPyShapeEvtHandler(void *ptr) { + wxPyControlPoint *src; wxPyShapeEvtHandler *dest; - src = (wxPyBitmapShape *) ptr; + src = (wxPyControlPoint *) ptr; dest = (wxPyShapeEvtHandler *) src; return (void *) dest; } -#define new_wxPyBitmapShape() (new wxPyBitmapShape()) -static PyObject *_wrap_new_wxPyBitmapShape(PyObject *self, PyObject *args, PyObject *kwargs) { +#define new_wxPyControlPoint(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxPyControlPoint(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) +static PyObject *_wrap_new_wxPyControlPoint(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPyBitmapShape * _result; - char *_kwnames[] = { NULL }; + wxPyControlPoint * _result; + wxPyShapeCanvas * _arg0 = (wxPyShapeCanvas *) NULL; + wxPyShape * _arg1 = (wxPyShape *) NULL; + double _arg2 = (double ) 0.0; + double _arg3 = (double ) 0.0; + double _arg4 = (double ) 0.0; + int _arg5 = (int ) 0; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "the_canvas","object","size","the_xoffset","the_yoffset","the_type", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxPyBitmapShape",_kwnames)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|OOdddi:new_wxPyControlPoint",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3,&_arg4,&_arg5)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyShapeCanvas_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxPyControlPoint. Expected _wxPyShapeCanvas_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyShape_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of new_wxPyControlPoint. Expected _wxPyShape_p."); return NULL; + } + } { wxPy_BEGIN_ALLOW_THREADS; - _result = (wxPyBitmapShape *)new_wxPyBitmapShape(); + _result = (wxPyControlPoint *)new_wxPyControlPoint(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5); wxPy_END_ALLOW_THREADS; } if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyBitmapShape_p"); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyControlPoint_p"); _resultobj = Py_BuildValue("s",_ptemp); } else { Py_INCREF(Py_None); @@ -2846,22 +2847,22 @@ static PyObject *_wrap_new_wxPyBitmapShape(PyObject *self, PyObject *args, PyObj return _resultobj; } -#define wxPyBitmapShape__setSelf(_swigobj,_swigarg0) (_swigobj->_setSelf(_swigarg0)) -static PyObject *_wrap_wxPyBitmapShape__setSelf(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPyControlPoint__setSelf(_swigobj,_swigarg0) (_swigobj->_setSelf(_swigarg0)) +static PyObject *_wrap_wxPyControlPoint__setSelf(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPyBitmapShape * _arg0; + wxPyControlPoint * _arg0; PyObject * _arg1; PyObject * _argo0 = 0; PyObject * _obj1 = 0; char *_kwnames[] = { "self","self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyBitmapShape__setSelf",_kwnames,&_argo0,&_obj1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyControlPoint__setSelf",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyBitmapShape_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyBitmapShape__setSelf. Expected _wxPyBitmapShape_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyControlPoint__setSelf. Expected _wxPyControlPoint_p."); return NULL; } } @@ -2870,7 +2871,7 @@ static PyObject *_wrap_wxPyBitmapShape__setSelf(PyObject *self, PyObject *args, } { wxPy_BEGIN_ALLOW_THREADS; - wxPyBitmapShape__setSelf(_arg0,_arg1); + wxPyControlPoint__setSelf(_arg0,_arg1); wxPy_END_ALLOW_THREADS; } Py_INCREF(Py_None); @@ -2878,102 +2879,90 @@ static PyObject *_wrap_wxPyBitmapShape__setSelf(PyObject *self, PyObject *args, return _resultobj; } -#define wxPyBitmapShape_GetBitmap(_swigobj) (_swigobj->GetBitmap()) -static PyObject *_wrap_wxPyBitmapShape_GetBitmap(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPyControlPoint_SetCornerRadius(_swigobj,_swigarg0) (_swigobj->SetCornerRadius(_swigarg0)) +static PyObject *_wrap_wxPyControlPoint_SetCornerRadius(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxBitmap * _result; - wxPyBitmapShape * _arg0; + wxPyControlPoint * _arg0; + double _arg1; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; - char _ptemp[128]; + char *_kwnames[] = { "self","radius", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyBitmapShape_GetBitmap",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Od:wxPyControlPoint_SetCornerRadius",_kwnames,&_argo0,&_arg1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyBitmapShape_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyBitmapShape_GetBitmap. Expected _wxPyBitmapShape_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyControlPoint_SetCornerRadius. Expected _wxPyControlPoint_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - wxBitmap & _result_ref = wxPyBitmapShape_GetBitmap(_arg0); - _result = (wxBitmap *) &_result_ref; + wxPyControlPoint_SetCornerRadius(_arg0,_arg1); wxPy_END_ALLOW_THREADS; -} if (_result) { - SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p"); - _resultobj = Py_BuildValue("s",_ptemp); - } else { - Py_INCREF(Py_None); - _resultobj = Py_None; - } +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxPyBitmapShape_GetFilename(_swigobj) (_swigobj->GetFilename()) -static PyObject *_wrap_wxPyBitmapShape_GetFilename(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPyControlPoint_base_OnDelete(_swigobj) (_swigobj->base_OnDelete()) +static PyObject *_wrap_wxPyControlPoint_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxString * _result; - wxPyBitmapShape * _arg0; + wxPyControlPoint * _arg0; PyObject * _argo0 = 0; char *_kwnames[] = { "self", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyBitmapShape_GetFilename",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyControlPoint_base_OnDelete",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyBitmapShape_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyBitmapShape_GetFilename. Expected _wxPyBitmapShape_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyControlPoint_base_OnDelete. Expected _wxPyControlPoint_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - _result = new wxString (wxPyBitmapShape_GetFilename(_arg0)); + wxPyControlPoint_base_OnDelete(_arg0); wxPy_END_ALLOW_THREADS; -}{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); -} -{ - delete _result; -} +} Py_INCREF(Py_None); + _resultobj = Py_None; return _resultobj; } -#define wxPyBitmapShape_SetBitmap(_swigobj,_swigarg0) (_swigobj->SetBitmap(_swigarg0)) -static PyObject *_wrap_wxPyBitmapShape_SetBitmap(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPyControlPoint_base_OnDraw(_swigobj,_swigarg0) (_swigobj->base_OnDraw(_swigarg0)) +static PyObject *_wrap_wxPyControlPoint_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPyBitmapShape * _arg0; - wxBitmap * _arg1; + wxPyControlPoint * _arg0; + wxDC * _arg1; PyObject * _argo0 = 0; PyObject * _argo1 = 0; - char *_kwnames[] = { "self","bitmap", NULL }; + char *_kwnames[] = { "self","dc", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyBitmapShape_SetBitmap",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyControlPoint_base_OnDraw",_kwnames,&_argo0,&_argo1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyBitmapShape_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyBitmapShape_SetBitmap. Expected _wxPyBitmapShape_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyControlPoint_base_OnDraw. Expected _wxPyControlPoint_p."); return NULL; } } if (_argo1) { if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxBitmap_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyBitmapShape_SetBitmap. Expected _wxBitmap_p."); + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyControlPoint_base_OnDraw. Expected _wxDC_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - wxPyBitmapShape_SetBitmap(_arg0,*_arg1); + wxPyControlPoint_base_OnDraw(_arg0,*_arg1); wxPy_END_ALLOW_THREADS; } Py_INCREF(Py_None); @@ -2981,66 +2970,74 @@ static PyObject *_wrap_wxPyBitmapShape_SetBitmap(PyObject *self, PyObject *args, return _resultobj; } -#define wxPyBitmapShape_SetFilename(_swigobj,_swigarg0) (_swigobj->SetFilename(_swigarg0)) -static PyObject *_wrap_wxPyBitmapShape_SetFilename(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPyControlPoint_base_OnDrawContents(_swigobj,_swigarg0) (_swigobj->base_OnDrawContents(_swigarg0)) +static PyObject *_wrap_wxPyControlPoint_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPyBitmapShape * _arg0; - wxString * _arg1; + wxPyControlPoint * _arg0; + wxDC * _arg1; PyObject * _argo0 = 0; - PyObject * _obj1 = 0; - char *_kwnames[] = { "self","filename", NULL }; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","dc", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyBitmapShape_SetFilename",_kwnames,&_argo0,&_obj1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyControlPoint_base_OnDrawContents",_kwnames,&_argo0,&_argo1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyBitmapShape_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyBitmapShape_SetFilename. Expected _wxPyBitmapShape_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyControlPoint_base_OnDrawContents. Expected _wxPyControlPoint_p."); return NULL; } } -{ - if (!PyString_Check(_obj1)) { - PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyControlPoint_base_OnDrawContents. Expected _wxDC_p."); return NULL; + } } - _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1)); -} { wxPy_BEGIN_ALLOW_THREADS; - wxPyBitmapShape_SetFilename(_arg0,*_arg1); + wxPyControlPoint_base_OnDrawContents(_arg0,*_arg1); wxPy_END_ALLOW_THREADS; } Py_INCREF(Py_None); _resultobj = Py_None; -{ - if (_obj1) - delete _arg1; -} return _resultobj; } -#define wxPyBitmapShape_base_OnDelete(_swigobj) (_swigobj->base_OnDelete()) -static PyObject *_wrap_wxPyBitmapShape_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPyControlPoint_base_OnDrawBranches(_swigobj,_swigarg0,_swigarg1) (_swigobj->base_OnDrawBranches(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxPyControlPoint_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPyBitmapShape * _arg0; + wxPyControlPoint * _arg0; + wxDC * _arg1; + bool _arg2 = (bool ) FALSE; PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; + PyObject * _argo1 = 0; + int tempbool2 = (int) FALSE; + char *_kwnames[] = { "self","dc","erase", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyBitmapShape_base_OnDelete",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|i:wxPyControlPoint_base_OnDrawBranches",_kwnames,&_argo0,&_argo1,&tempbool2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyBitmapShape_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyBitmapShape_base_OnDelete. Expected _wxPyBitmapShape_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyControlPoint_base_OnDrawBranches. Expected _wxPyControlPoint_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyControlPoint_base_OnDrawBranches. Expected _wxDC_p."); return NULL; } } + _arg2 = (bool ) tempbool2; { wxPy_BEGIN_ALLOW_THREADS; - wxPyBitmapShape_base_OnDelete(_arg0); + wxPyControlPoint_base_OnDrawBranches(_arg0,*_arg1,_arg2); wxPy_END_ALLOW_THREADS; } Py_INCREF(Py_None); @@ -3048,35 +3045,35 @@ static PyObject *_wrap_wxPyBitmapShape_base_OnDelete(PyObject *self, PyObject *a return _resultobj; } -#define wxPyBitmapShape_base_OnDraw(_swigobj,_swigarg0) (_swigobj->base_OnDraw(_swigarg0)) -static PyObject *_wrap_wxPyBitmapShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPyControlPoint_base_OnMoveLinks(_swigobj,_swigarg0) (_swigobj->base_OnMoveLinks(_swigarg0)) +static PyObject *_wrap_wxPyControlPoint_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPyBitmapShape * _arg0; + wxPyControlPoint * _arg0; wxDC * _arg1; PyObject * _argo0 = 0; PyObject * _argo1 = 0; char *_kwnames[] = { "self","dc", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyBitmapShape_base_OnDraw",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyControlPoint_base_OnMoveLinks",_kwnames,&_argo0,&_argo1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyBitmapShape_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyBitmapShape_base_OnDraw. Expected _wxPyBitmapShape_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyControlPoint_base_OnMoveLinks. Expected _wxPyControlPoint_p."); return NULL; } } if (_argo1) { if (_argo1 == Py_None) { _arg1 = NULL; } else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxDC_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyBitmapShape_base_OnDraw. Expected _wxDC_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyControlPoint_base_OnMoveLinks. Expected _wxDC_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - wxPyBitmapShape_base_OnDraw(_arg0,*_arg1); + wxPyControlPoint_base_OnMoveLinks(_arg0,*_arg1); wxPy_END_ALLOW_THREADS; } Py_INCREF(Py_None); @@ -3084,35 +3081,35 @@ static PyObject *_wrap_wxPyBitmapShape_base_OnDraw(PyObject *self, PyObject *arg return _resultobj; } -#define wxPyBitmapShape_base_OnDrawContents(_swigobj,_swigarg0) (_swigobj->base_OnDrawContents(_swigarg0)) -static PyObject *_wrap_wxPyBitmapShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPyControlPoint_base_OnErase(_swigobj,_swigarg0) (_swigobj->base_OnErase(_swigarg0)) +static PyObject *_wrap_wxPyControlPoint_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPyBitmapShape * _arg0; + wxPyControlPoint * _arg0; wxDC * _arg1; PyObject * _argo0 = 0; PyObject * _argo1 = 0; char *_kwnames[] = { "self","dc", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyBitmapShape_base_OnDrawContents",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyControlPoint_base_OnErase",_kwnames,&_argo0,&_argo1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyBitmapShape_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyBitmapShape_base_OnDrawContents. Expected _wxPyBitmapShape_p."); + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyControlPoint_base_OnErase. Expected _wxPyControlPoint_p."); return NULL; } } if (_argo1) { if (_argo1 == Py_None) { _arg1 = NULL; } else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxDC_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyBitmapShape_base_OnDrawContents. Expected _wxDC_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyControlPoint_base_OnErase. Expected _wxDC_p."); return NULL; } } { wxPy_BEGIN_ALLOW_THREADS; - wxPyBitmapShape_base_OnDrawContents(_arg0,*_arg1); + wxPyControlPoint_base_OnErase(_arg0,*_arg1); wxPy_END_ALLOW_THREADS; } Py_INCREF(Py_None); @@ -3120,16 +3117,1143 @@ static PyObject *_wrap_wxPyBitmapShape_base_OnDrawContents(PyObject *self, PyObj return _resultobj; } -#define wxPyBitmapShape_base_OnDrawBranches(_swigobj,_swigarg0,_swigarg1) (_swigobj->base_OnDrawBranches(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxPyBitmapShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxPyControlPoint_base_OnEraseContents(_swigobj,_swigarg0) (_swigobj->base_OnEraseContents(_swigarg0)) +static PyObject *_wrap_wxPyControlPoint_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; - wxPyBitmapShape * _arg0; + wxPyControlPoint * _arg0; wxDC * _arg1; - bool _arg2 = (bool ) FALSE; PyObject * _argo0 = 0; PyObject * _argo1 = 0; - int tempbool2 = (int) FALSE; - char *_kwnames[] = { "self","dc","erase", NULL }; + char *_kwnames[] = { "self","dc", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyControlPoint_base_OnEraseContents",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyControlPoint_base_OnEraseContents. Expected _wxPyControlPoint_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyControlPoint_base_OnEraseContents. Expected _wxDC_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxPyControlPoint_base_OnEraseContents(_arg0,*_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPyControlPoint_base_OnHighlight(_swigobj,_swigarg0) (_swigobj->base_OnHighlight(_swigarg0)) +static PyObject *_wrap_wxPyControlPoint_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyControlPoint * _arg0; + wxDC * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","dc", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyControlPoint_base_OnHighlight",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyControlPoint_base_OnHighlight. Expected _wxPyControlPoint_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyControlPoint_base_OnHighlight. Expected _wxDC_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxPyControlPoint_base_OnHighlight(_arg0,*_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPyControlPoint_base_OnLeftClick(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->base_OnLeftClick(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) +static PyObject *_wrap_wxPyControlPoint_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyControlPoint * _arg0; + double _arg1; + double _arg2; + int _arg3 = (int ) 0; + int _arg4 = (int ) 0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","x","y","keys","attachment", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Odd|ii:wxPyControlPoint_base_OnLeftClick",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyControlPoint_base_OnLeftClick. Expected _wxPyControlPoint_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxPyControlPoint_base_OnLeftClick(_arg0,_arg1,_arg2,_arg3,_arg4); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPyControlPoint_base_OnLeftDoubleClick(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->base_OnLeftDoubleClick(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) +static PyObject *_wrap_wxPyControlPoint_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyControlPoint * _arg0; + double _arg1; + double _arg2; + int _arg3 = (int ) 0; + int _arg4 = (int ) 0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","x","y","keys","attachment", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Odd|ii:wxPyControlPoint_base_OnLeftDoubleClick",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyControlPoint_base_OnLeftDoubleClick. Expected _wxPyControlPoint_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxPyControlPoint_base_OnLeftDoubleClick(_arg0,_arg1,_arg2,_arg3,_arg4); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPyControlPoint_base_OnRightClick(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->base_OnRightClick(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) +static PyObject *_wrap_wxPyControlPoint_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyControlPoint * _arg0; + double _arg1; + double _arg2; + int _arg3 = (int ) 0; + int _arg4 = (int ) 0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","x","y","keys","attachment", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Odd|ii:wxPyControlPoint_base_OnRightClick",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyControlPoint_base_OnRightClick. Expected _wxPyControlPoint_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxPyControlPoint_base_OnRightClick(_arg0,_arg1,_arg2,_arg3,_arg4); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPyControlPoint_base_OnSize(_swigobj,_swigarg0,_swigarg1) (_swigobj->base_OnSize(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxPyControlPoint_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyControlPoint * _arg0; + double _arg1; + double _arg2; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","x","y", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Odd:wxPyControlPoint_base_OnSize",_kwnames,&_argo0,&_arg1,&_arg2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyControlPoint_base_OnSize. Expected _wxPyControlPoint_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxPyControlPoint_base_OnSize(_arg0,_arg1,_arg2); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPyControlPoint_base_OnMovePre(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (_swigobj->base_OnMovePre(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) +static PyObject *_wrap_wxPyControlPoint_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxPyControlPoint * _arg0; + wxDC * _arg1; + double _arg2; + double _arg3; + double _arg4; + double _arg5; + bool _arg6 = (bool ) TRUE; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + int tempbool6 = (int) TRUE; + char *_kwnames[] = { "self","dc","x","y","old_x","old_y","display", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOdddd|i:wxPyControlPoint_base_OnMovePre",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3,&_arg4,&_arg5,&tempbool6)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyControlPoint_base_OnMovePre. Expected _wxPyControlPoint_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyControlPoint_base_OnMovePre. Expected _wxDC_p."); + return NULL; + } + } + _arg6 = (bool ) tempbool6; +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (bool )wxPyControlPoint_base_OnMovePre(_arg0,*_arg1,_arg2,_arg3,_arg4,_arg5,_arg6); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxPyControlPoint_base_OnMovePost(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (_swigobj->base_OnMovePost(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) +static PyObject *_wrap_wxPyControlPoint_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyControlPoint * _arg0; + wxDC * _arg1; + double _arg2; + double _arg3; + double _arg4; + double _arg5; + bool _arg6 = (bool ) TRUE; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + int tempbool6 = (int) TRUE; + char *_kwnames[] = { "self","dc","x","y","old_x","old_y","display", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOdddd|i:wxPyControlPoint_base_OnMovePost",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3,&_arg4,&_arg5,&tempbool6)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyControlPoint_base_OnMovePost. Expected _wxPyControlPoint_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyControlPoint_base_OnMovePost. Expected _wxDC_p."); + return NULL; + } + } + _arg6 = (bool ) tempbool6; +{ + wxPy_BEGIN_ALLOW_THREADS; + wxPyControlPoint_base_OnMovePost(_arg0,*_arg1,_arg2,_arg3,_arg4,_arg5,_arg6); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPyControlPoint_base_OnDragLeft(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (_swigobj->base_OnDragLeft(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4)) +static PyObject *_wrap_wxPyControlPoint_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyControlPoint * _arg0; + bool _arg1; + double _arg2; + double _arg3; + int _arg4 = (int ) 0; + int _arg5 = (int ) 0; + PyObject * _argo0 = 0; + int tempbool1; + char *_kwnames[] = { "self","draw","x","y","keys","attachment", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oidd|ii:wxPyControlPoint_base_OnDragLeft",_kwnames,&_argo0,&tempbool1,&_arg2,&_arg3,&_arg4,&_arg5)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyControlPoint_base_OnDragLeft. Expected _wxPyControlPoint_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; +{ + wxPy_BEGIN_ALLOW_THREADS; + wxPyControlPoint_base_OnDragLeft(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPyControlPoint_base_OnBeginDragLeft(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->base_OnBeginDragLeft(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) +static PyObject *_wrap_wxPyControlPoint_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyControlPoint * _arg0; + double _arg1; + double _arg2; + int _arg3 = (int ) 0; + int _arg4 = (int ) 0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","x","y","keys","attachment", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Odd|ii:wxPyControlPoint_base_OnBeginDragLeft",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyControlPoint_base_OnBeginDragLeft. Expected _wxPyControlPoint_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxPyControlPoint_base_OnBeginDragLeft(_arg0,_arg1,_arg2,_arg3,_arg4); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPyControlPoint_base_OnEndDragLeft(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->base_OnEndDragLeft(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) +static PyObject *_wrap_wxPyControlPoint_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyControlPoint * _arg0; + double _arg1; + double _arg2; + int _arg3 = (int ) 0; + int _arg4 = (int ) 0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","x","y","keys","attachment", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Odd|ii:wxPyControlPoint_base_OnEndDragLeft",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyControlPoint_base_OnEndDragLeft. Expected _wxPyControlPoint_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxPyControlPoint_base_OnEndDragLeft(_arg0,_arg1,_arg2,_arg3,_arg4); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPyControlPoint_base_OnDragRight(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (_swigobj->base_OnDragRight(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4)) +static PyObject *_wrap_wxPyControlPoint_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyControlPoint * _arg0; + bool _arg1; + double _arg2; + double _arg3; + int _arg4 = (int ) 0; + int _arg5 = (int ) 0; + PyObject * _argo0 = 0; + int tempbool1; + char *_kwnames[] = { "self","draw","x","y","keys","attachment", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oidd|ii:wxPyControlPoint_base_OnDragRight",_kwnames,&_argo0,&tempbool1,&_arg2,&_arg3,&_arg4,&_arg5)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyControlPoint_base_OnDragRight. Expected _wxPyControlPoint_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; +{ + wxPy_BEGIN_ALLOW_THREADS; + wxPyControlPoint_base_OnDragRight(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPyControlPoint_base_OnBeginDragRight(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->base_OnBeginDragRight(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) +static PyObject *_wrap_wxPyControlPoint_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyControlPoint * _arg0; + double _arg1; + double _arg2; + int _arg3 = (int ) 0; + int _arg4 = (int ) 0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","x","y","keys","attachment", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Odd|ii:wxPyControlPoint_base_OnBeginDragRight",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyControlPoint_base_OnBeginDragRight. Expected _wxPyControlPoint_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxPyControlPoint_base_OnBeginDragRight(_arg0,_arg1,_arg2,_arg3,_arg4); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPyControlPoint_base_OnEndDragRight(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->base_OnEndDragRight(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) +static PyObject *_wrap_wxPyControlPoint_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyControlPoint * _arg0; + double _arg1; + double _arg2; + int _arg3 = (int ) 0; + int _arg4 = (int ) 0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","x","y","keys","attachment", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Odd|ii:wxPyControlPoint_base_OnEndDragRight",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyControlPoint_base_OnEndDragRight. Expected _wxPyControlPoint_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxPyControlPoint_base_OnEndDragRight(_arg0,_arg1,_arg2,_arg3,_arg4); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPyControlPoint_base_OnDrawOutline(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (_swigobj->base_OnDrawOutline(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4)) +static PyObject *_wrap_wxPyControlPoint_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyControlPoint * _arg0; + wxDC * _arg1; + double _arg2; + double _arg3; + double _arg4; + double _arg5; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","dc","x","y","w","h", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOdddd:wxPyControlPoint_base_OnDrawOutline",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3,&_arg4,&_arg5)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyControlPoint_base_OnDrawOutline. Expected _wxPyControlPoint_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyControlPoint_base_OnDrawOutline. Expected _wxDC_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxPyControlPoint_base_OnDrawOutline(_arg0,*_arg1,_arg2,_arg3,_arg4,_arg5); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPyControlPoint_base_OnDrawControlPoints(_swigobj,_swigarg0) (_swigobj->base_OnDrawControlPoints(_swigarg0)) +static PyObject *_wrap_wxPyControlPoint_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyControlPoint * _arg0; + wxDC * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","dc", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyControlPoint_base_OnDrawControlPoints",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyControlPoint_base_OnDrawControlPoints. Expected _wxPyControlPoint_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyControlPoint_base_OnDrawControlPoints. Expected _wxDC_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxPyControlPoint_base_OnDrawControlPoints(_arg0,*_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPyControlPoint_base_OnEraseControlPoints(_swigobj,_swigarg0) (_swigobj->base_OnEraseControlPoints(_swigarg0)) +static PyObject *_wrap_wxPyControlPoint_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyControlPoint * _arg0; + wxDC * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","dc", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyControlPoint_base_OnEraseControlPoints",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyControlPoint_base_OnEraseControlPoints. Expected _wxPyControlPoint_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyControlPoint_base_OnEraseControlPoints. Expected _wxDC_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxPyControlPoint_base_OnEraseControlPoints(_arg0,*_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPyControlPoint_base_OnMoveLink(_swigobj,_swigarg0,_swigarg1) (_swigobj->base_OnMoveLink(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxPyControlPoint_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyControlPoint * _arg0; + wxDC * _arg1; + bool _arg2 = (bool ) TRUE; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + int tempbool2 = (int) TRUE; + char *_kwnames[] = { "self","dc","moveControlPoints", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|i:wxPyControlPoint_base_OnMoveLink",_kwnames,&_argo0,&_argo1,&tempbool2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyControlPoint_base_OnMoveLink. Expected _wxPyControlPoint_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyControlPoint_base_OnMoveLink. Expected _wxDC_p."); + return NULL; + } + } + _arg2 = (bool ) tempbool2; +{ + wxPy_BEGIN_ALLOW_THREADS; + wxPyControlPoint_base_OnMoveLink(_arg0,*_arg1,_arg2); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPyControlPoint_base_OnSizingDragLeft(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (_swigobj->base_OnSizingDragLeft(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) +static PyObject *_wrap_wxPyControlPoint_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyControlPoint * _arg0; + wxPyControlPoint * _arg1; + bool _arg2; + double _arg3; + double _arg4; + int _arg5 = (int ) 0; + int _arg6 = (int ) 0; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + int tempbool2; + char *_kwnames[] = { "self","pt","draw","x","y","keys","attachment", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOidd|ii:wxPyControlPoint_base_OnSizingDragLeft",_kwnames,&_argo0,&_argo1,&tempbool2,&_arg3,&_arg4,&_arg5,&_arg6)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyControlPoint_base_OnSizingDragLeft. Expected _wxPyControlPoint_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyControlPoint_base_OnSizingDragLeft. Expected _wxPyControlPoint_p."); + return NULL; + } + } + _arg2 = (bool ) tempbool2; +{ + wxPy_BEGIN_ALLOW_THREADS; + wxPyControlPoint_base_OnSizingDragLeft(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPyControlPoint_base_OnSizingBeginDragLeft(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (_swigobj->base_OnSizingBeginDragLeft(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4)) +static PyObject *_wrap_wxPyControlPoint_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyControlPoint * _arg0; + wxPyControlPoint * _arg1; + double _arg2; + double _arg3; + int _arg4 = (int ) 0; + int _arg5 = (int ) 0; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","pt","x","y","keys","attachment", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOdd|ii:wxPyControlPoint_base_OnSizingBeginDragLeft",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3,&_arg4,&_arg5)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyControlPoint_base_OnSizingBeginDragLeft. Expected _wxPyControlPoint_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyControlPoint_base_OnSizingBeginDragLeft. Expected _wxPyControlPoint_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxPyControlPoint_base_OnSizingBeginDragLeft(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPyControlPoint_base_OnSizingEndDragLeft(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (_swigobj->base_OnSizingEndDragLeft(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4)) +static PyObject *_wrap_wxPyControlPoint_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyControlPoint * _arg0; + wxPyControlPoint * _arg1; + double _arg2; + double _arg3; + int _arg4 = (int ) 0; + int _arg5 = (int ) 0; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","pt","x","y","keys","attachment", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOdd|ii:wxPyControlPoint_base_OnSizingEndDragLeft",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3,&_arg4,&_arg5)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyControlPoint_base_OnSizingEndDragLeft. Expected _wxPyControlPoint_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyControlPoint_base_OnSizingEndDragLeft. Expected _wxPyControlPoint_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxPyControlPoint_base_OnSizingEndDragLeft(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPyControlPoint_base_OnBeginSize(_swigobj,_swigarg0,_swigarg1) (_swigobj->base_OnBeginSize(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxPyControlPoint_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyControlPoint * _arg0; + double _arg1; + double _arg2; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","w","h", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Odd:wxPyControlPoint_base_OnBeginSize",_kwnames,&_argo0,&_arg1,&_arg2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyControlPoint_base_OnBeginSize. Expected _wxPyControlPoint_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxPyControlPoint_base_OnBeginSize(_arg0,_arg1,_arg2); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPyControlPoint_base_OnEndSize(_swigobj,_swigarg0,_swigarg1) (_swigobj->base_OnEndSize(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxPyControlPoint_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyControlPoint * _arg0; + double _arg1; + double _arg2; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","w","h", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Odd:wxPyControlPoint_base_OnEndSize",_kwnames,&_argo0,&_arg1,&_arg2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyControlPoint_base_OnEndSize. Expected _wxPyControlPoint_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxPyControlPoint_base_OnEndSize(_arg0,_arg1,_arg2); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static void *SwigwxPyBitmapShapeTowxPyRectangleShape(void *ptr) { + wxPyBitmapShape *src; + wxPyRectangleShape *dest; + src = (wxPyBitmapShape *) ptr; + dest = (wxPyRectangleShape *) src; + return (void *) dest; +} + +static void *SwigwxPyBitmapShapeTowxPyShape(void *ptr) { + wxPyBitmapShape *src; + wxPyShape *dest; + src = (wxPyBitmapShape *) ptr; + dest = (wxPyShape *) src; + return (void *) dest; +} + +static void *SwigwxPyBitmapShapeTowxPyShapeEvtHandler(void *ptr) { + wxPyBitmapShape *src; + wxPyShapeEvtHandler *dest; + src = (wxPyBitmapShape *) ptr; + dest = (wxPyShapeEvtHandler *) src; + return (void *) dest; +} + +#define new_wxPyBitmapShape() (new wxPyBitmapShape()) +static PyObject *_wrap_new_wxPyBitmapShape(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyBitmapShape * _result; + char *_kwnames[] = { NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxPyBitmapShape",_kwnames)) + return NULL; +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (wxPyBitmapShape *)new_wxPyBitmapShape(); + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyBitmapShape_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxPyBitmapShape__setSelf(_swigobj,_swigarg0) (_swigobj->_setSelf(_swigarg0)) +static PyObject *_wrap_wxPyBitmapShape__setSelf(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyBitmapShape * _arg0; + PyObject * _arg1; + PyObject * _argo0 = 0; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyBitmapShape__setSelf",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyBitmapShape_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyBitmapShape__setSelf. Expected _wxPyBitmapShape_p."); + return NULL; + } + } +{ + _arg1 = _obj1; +} +{ + wxPy_BEGIN_ALLOW_THREADS; + wxPyBitmapShape__setSelf(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPyBitmapShape_GetBitmap(_swigobj) (_swigobj->GetBitmap()) +static PyObject *_wrap_wxPyBitmapShape_GetBitmap(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxBitmap * _result; + wxPyBitmapShape * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyBitmapShape_GetBitmap",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyBitmapShape_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyBitmapShape_GetBitmap. Expected _wxPyBitmapShape_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxBitmap & _result_ref = wxPyBitmapShape_GetBitmap(_arg0); + _result = (wxBitmap *) &_result_ref; + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxPyBitmapShape_GetFilename(_swigobj) (_swigobj->GetFilename()) +static PyObject *_wrap_wxPyBitmapShape_GetFilename(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxString * _result; + wxPyBitmapShape * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyBitmapShape_GetFilename",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyBitmapShape_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyBitmapShape_GetFilename. Expected _wxPyBitmapShape_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = new wxString (wxPyBitmapShape_GetFilename(_arg0)); + + wxPy_END_ALLOW_THREADS; +}{ + _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); +} +{ + delete _result; +} + return _resultobj; +} + +#define wxPyBitmapShape_SetBitmap(_swigobj,_swigarg0) (_swigobj->SetBitmap(_swigarg0)) +static PyObject *_wrap_wxPyBitmapShape_SetBitmap(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyBitmapShape * _arg0; + wxBitmap * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","bitmap", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyBitmapShape_SetBitmap",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyBitmapShape_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyBitmapShape_SetBitmap. Expected _wxPyBitmapShape_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyBitmapShape_SetBitmap. Expected _wxBitmap_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxPyBitmapShape_SetBitmap(_arg0,*_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPyBitmapShape_SetFilename(_swigobj,_swigarg0) (_swigobj->SetFilename(_swigarg0)) +static PyObject *_wrap_wxPyBitmapShape_SetFilename(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyBitmapShape * _arg0; + wxString * _arg1; + PyObject * _argo0 = 0; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","filename", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyBitmapShape_SetFilename",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyBitmapShape_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyBitmapShape_SetFilename. Expected _wxPyBitmapShape_p."); + return NULL; + } + } +{ + if (!PyString_Check(_obj1)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1)); +} +{ + wxPy_BEGIN_ALLOW_THREADS; + wxPyBitmapShape_SetFilename(_arg0,*_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; +{ + if (_obj1) + delete _arg1; +} + return _resultobj; +} + +#define wxPyBitmapShape_base_OnDelete(_swigobj) (_swigobj->base_OnDelete()) +static PyObject *_wrap_wxPyBitmapShape_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyBitmapShape * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyBitmapShape_base_OnDelete",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyBitmapShape_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyBitmapShape_base_OnDelete. Expected _wxPyBitmapShape_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxPyBitmapShape_base_OnDelete(_arg0); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPyBitmapShape_base_OnDraw(_swigobj,_swigarg0) (_swigobj->base_OnDraw(_swigarg0)) +static PyObject *_wrap_wxPyBitmapShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyBitmapShape * _arg0; + wxDC * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","dc", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyBitmapShape_base_OnDraw",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyBitmapShape_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyBitmapShape_base_OnDraw. Expected _wxPyBitmapShape_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyBitmapShape_base_OnDraw. Expected _wxDC_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxPyBitmapShape_base_OnDraw(_arg0,*_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPyBitmapShape_base_OnDrawContents(_swigobj,_swigarg0) (_swigobj->base_OnDrawContents(_swigarg0)) +static PyObject *_wrap_wxPyBitmapShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyBitmapShape * _arg0; + wxDC * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","dc", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyBitmapShape_base_OnDrawContents",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyBitmapShape_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyBitmapShape_base_OnDrawContents. Expected _wxPyBitmapShape_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyBitmapShape_base_OnDrawContents. Expected _wxDC_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxPyBitmapShape_base_OnDrawContents(_arg0,*_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPyBitmapShape_base_OnDrawBranches(_swigobj,_swigarg0,_swigarg1) (_swigobj->base_OnDrawBranches(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxPyBitmapShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPyBitmapShape * _arg0; + wxDC * _arg1; + bool _arg2 = (bool ) FALSE; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + int tempbool2 = (int) FALSE; + char *_kwnames[] = { "self","dc","erase", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|i:wxPyBitmapShape_base_OnDrawBranches",_kwnames,&_argo0,&_argo1,&tempbool2)) @@ -3858,7 +4982,7 @@ static PyObject *_wrap_wxPyBitmapShape_base_OnMoveLink(PyObject *self, PyObject static PyObject *_wrap_wxPyBitmapShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPyBitmapShape * _arg0; - wxControlPoint * _arg1; + wxPyControlPoint * _arg1; bool _arg2; double _arg3; double _arg4; @@ -3881,8 +5005,8 @@ static PyObject *_wrap_wxPyBitmapShape_base_OnSizingDragLeft(PyObject *self, PyO } 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 wxPyBitmapShape_base_OnSizingDragLeft. Expected _wxControlPoint_p."); + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyBitmapShape_base_OnSizingDragLeft. Expected _wxPyControlPoint_p."); return NULL; } } @@ -3901,7 +5025,7 @@ static PyObject *_wrap_wxPyBitmapShape_base_OnSizingDragLeft(PyObject *self, PyO static PyObject *_wrap_wxPyBitmapShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPyBitmapShape * _arg0; - wxControlPoint * _arg1; + wxPyControlPoint * _arg1; double _arg2; double _arg3; int _arg4 = (int ) 0; @@ -3922,8 +5046,8 @@ static PyObject *_wrap_wxPyBitmapShape_base_OnSizingBeginDragLeft(PyObject *self } 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 wxPyBitmapShape_base_OnSizingBeginDragLeft. Expected _wxControlPoint_p."); + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyBitmapShape_base_OnSizingBeginDragLeft. Expected _wxPyControlPoint_p."); return NULL; } } @@ -3941,7 +5065,7 @@ static PyObject *_wrap_wxPyBitmapShape_base_OnSizingBeginDragLeft(PyObject *self static PyObject *_wrap_wxPyBitmapShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPyBitmapShape * _arg0; - wxControlPoint * _arg1; + wxPyControlPoint * _arg1; double _arg2; double _arg3; int _arg4 = (int ) 0; @@ -3962,8 +5086,8 @@ static PyObject *_wrap_wxPyBitmapShape_base_OnSizingEndDragLeft(PyObject *self, } 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 wxPyBitmapShape_base_OnSizingEndDragLeft. Expected _wxControlPoint_p."); + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyBitmapShape_base_OnSizingEndDragLeft. Expected _wxPyControlPoint_p."); return NULL; } } @@ -4178,13 +5302,16 @@ static PyObject *_wrap_wxPyDrawnShape_DrawArc(PyObject *self, PyObject *args, Py wxPoint * _arg2; wxPoint * _arg3; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - PyObject * _argo2 = 0; - PyObject * _argo3 = 0; + wxPoint temp; + PyObject * _obj1 = 0; + wxPoint temp0; + PyObject * _obj2 = 0; + wxPoint temp1; + PyObject * _obj3 = 0; char *_kwnames[] = { "self","centrePoint","startPoint","endPoint", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOO:wxPyDrawnShape_DrawArc",_kwnames,&_argo0,&_argo1,&_argo2,&_argo3)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOO:wxPyDrawnShape_DrawArc",_kwnames,&_argo0,&_obj1,&_obj2,&_obj3)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4193,27 +5320,21 @@ static PyObject *_wrap_wxPyDrawnShape_DrawArc(PyObject *self, PyObject *args, Py return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyDrawnShape_DrawArc. Expected _wxPoint_p."); +{ + _arg1 = &temp; + if (! wxPoint_helper(_obj1, &_arg1)) return NULL; - } - } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxPyDrawnShape_DrawArc. Expected _wxPoint_p."); +} +{ + _arg2 = &temp0; + if (! wxPoint_helper(_obj2, &_arg2)) return NULL; - } - } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxPyDrawnShape_DrawArc. Expected _wxPoint_p."); +} +{ + _arg3 = &temp1; + if (! wxPoint_helper(_obj3, &_arg3)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxPyDrawnShape_DrawArc(_arg0,*_arg1,*_arg2,*_arg3); @@ -4260,11 +5381,12 @@ static PyObject *_wrap_wxPyDrawnShape_DrawEllipticArc(PyObject *self, PyObject * double _arg2; double _arg3; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxRect temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","rect","startAngle","endAngle", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOdd:wxPyDrawnShape_DrawEllipticArc",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOdd:wxPyDrawnShape_DrawEllipticArc",_kwnames,&_argo0,&_obj1,&_arg2,&_arg3)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4273,13 +5395,11 @@ static PyObject *_wrap_wxPyDrawnShape_DrawEllipticArc(PyObject *self, PyObject * return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyDrawnShape_DrawEllipticArc. Expected _wxRect_p."); +{ + _arg1 = &temp; + if (! wxRect_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxPyDrawnShape_DrawEllipticArc(_arg0,*_arg1,_arg2,_arg3); @@ -4297,12 +5417,14 @@ static PyObject *_wrap_wxPyDrawnShape_DrawLine(PyObject *self, PyObject *args, P wxPoint * _arg1; wxPoint * _arg2; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - PyObject * _argo2 = 0; + wxPoint temp; + PyObject * _obj1 = 0; + wxPoint temp0; + PyObject * _obj2 = 0; char *_kwnames[] = { "self","point1","point2", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPyDrawnShape_DrawLine",_kwnames,&_argo0,&_argo1,&_argo2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPyDrawnShape_DrawLine",_kwnames,&_argo0,&_obj1,&_obj2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4311,20 +5433,16 @@ static PyObject *_wrap_wxPyDrawnShape_DrawLine(PyObject *self, PyObject *args, P return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyDrawnShape_DrawLine. Expected _wxPoint_p."); +{ + _arg1 = &temp; + if (! wxPoint_helper(_obj1, &_arg1)) return NULL; - } - } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxPyDrawnShape_DrawLine. Expected _wxPoint_p."); +} +{ + _arg2 = &temp0; + if (! wxPoint_helper(_obj2, &_arg2)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxPyDrawnShape_DrawLine(_arg0,*_arg1,*_arg2); @@ -4389,11 +5507,12 @@ static PyObject *_wrap_wxPyDrawnShape_DrawPoint(PyObject *self, PyObject *args, wxPyDrawnShape * _arg0; wxPoint * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxPoint temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","point", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyDrawnShape_DrawPoint",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyDrawnShape_DrawPoint",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4402,13 +5521,11 @@ static PyObject *_wrap_wxPyDrawnShape_DrawPoint(PyObject *self, PyObject *args, return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyDrawnShape_DrawPoint. Expected _wxPoint_p."); +{ + _arg1 = &temp; + if (! wxPoint_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxPyDrawnShape_DrawPoint(_arg0,*_arg1); @@ -4474,11 +5591,12 @@ static PyObject *_wrap_wxPyDrawnShape_DrawRectangle(PyObject *self, PyObject *ar wxPyDrawnShape * _arg0; wxRect * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxRect temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","rect", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyDrawnShape_DrawRectangle",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyDrawnShape_DrawRectangle",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4487,13 +5605,11 @@ static PyObject *_wrap_wxPyDrawnShape_DrawRectangle(PyObject *self, PyObject *ar return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyDrawnShape_DrawRectangle. Expected _wxRect_p."); +{ + _arg1 = &temp; + if (! wxRect_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxPyDrawnShape_DrawRectangle(_arg0,*_arg1); @@ -4511,11 +5627,12 @@ static PyObject *_wrap_wxPyDrawnShape_DrawRoundedRectangle(PyObject *self, PyObj wxRect * _arg1; double _arg2; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxRect temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","rect","radius", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOd:wxPyDrawnShape_DrawRoundedRectangle",_kwnames,&_argo0,&_argo1,&_arg2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOd:wxPyDrawnShape_DrawRoundedRectangle",_kwnames,&_argo0,&_obj1,&_arg2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4524,13 +5641,11 @@ static PyObject *_wrap_wxPyDrawnShape_DrawRoundedRectangle(PyObject *self, PyObj return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyDrawnShape_DrawRoundedRectangle. Expected _wxRect_p."); +{ + _arg1 = &temp; + if (! wxRect_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxPyDrawnShape_DrawRoundedRectangle(_arg0,*_arg1,_arg2); @@ -4597,11 +5712,12 @@ static PyObject *_wrap_wxPyDrawnShape_DrawText(PyObject *self, PyObject *args, P wxPoint * _arg2; PyObject * _argo0 = 0; PyObject * _obj1 = 0; - PyObject * _argo2 = 0; + wxPoint temp; + PyObject * _obj2 = 0; char *_kwnames[] = { "self","text","point", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPyDrawnShape_DrawText",_kwnames,&_argo0,&_obj1,&_argo2)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPyDrawnShape_DrawText",_kwnames,&_argo0,&_obj1,&_obj2)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4617,13 +5733,11 @@ static PyObject *_wrap_wxPyDrawnShape_DrawText(PyObject *self, PyObject *args, P } _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1)); } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxPyDrawnShape_DrawText. Expected _wxPoint_p."); +{ + _arg2 = &temp; + if (! wxPoint_helper(_obj2, &_arg2)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxPyDrawnShape_DrawText(_arg0,*_arg1,*_arg2); @@ -4791,11 +5905,12 @@ static PyObject *_wrap_wxPyDrawnShape_SetClippingRect(PyObject *self, PyObject * wxPyDrawnShape * _arg0; wxRect * _arg1; PyObject * _argo0 = 0; - PyObject * _argo1 = 0; + wxRect temp; + PyObject * _obj1 = 0; char *_kwnames[] = { "self","rect", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyDrawnShape_SetClippingRect",_kwnames,&_argo0,&_argo1)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyDrawnShape_SetClippingRect",_kwnames,&_argo0,&_obj1)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -4804,13 +5919,11 @@ static PyObject *_wrap_wxPyDrawnShape_SetClippingRect(PyObject *self, PyObject * return NULL; } } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxRect_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyDrawnShape_SetClippingRect. Expected _wxRect_p."); +{ + _arg1 = &temp; + if (! wxRect_helper(_obj1, &_arg1)) return NULL; - } - } +} { wxPy_BEGIN_ALLOW_THREADS; wxPyDrawnShape_SetClippingRect(_arg0,*_arg1); @@ -5960,7 +7073,7 @@ static PyObject *_wrap_wxPyDrawnShape_base_OnMoveLink(PyObject *self, PyObject * static PyObject *_wrap_wxPyDrawnShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPyDrawnShape * _arg0; - wxControlPoint * _arg1; + wxPyControlPoint * _arg1; bool _arg2; double _arg3; double _arg4; @@ -5983,8 +7096,8 @@ static PyObject *_wrap_wxPyDrawnShape_base_OnSizingDragLeft(PyObject *self, PyOb } 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 wxPyDrawnShape_base_OnSizingDragLeft. Expected _wxControlPoint_p."); + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyDrawnShape_base_OnSizingDragLeft. Expected _wxPyControlPoint_p."); return NULL; } } @@ -6003,7 +7116,7 @@ static PyObject *_wrap_wxPyDrawnShape_base_OnSizingDragLeft(PyObject *self, PyOb static PyObject *_wrap_wxPyDrawnShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPyDrawnShape * _arg0; - wxControlPoint * _arg1; + wxPyControlPoint * _arg1; double _arg2; double _arg3; int _arg4 = (int ) 0; @@ -6024,8 +7137,8 @@ static PyObject *_wrap_wxPyDrawnShape_base_OnSizingBeginDragLeft(PyObject *self, } 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 wxPyDrawnShape_base_OnSizingBeginDragLeft. Expected _wxControlPoint_p."); + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyDrawnShape_base_OnSizingBeginDragLeft. Expected _wxPyControlPoint_p."); return NULL; } } @@ -6043,7 +7156,7 @@ static PyObject *_wrap_wxPyDrawnShape_base_OnSizingBeginDragLeft(PyObject *self, static PyObject *_wrap_wxPyDrawnShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPyDrawnShape * _arg0; - wxControlPoint * _arg1; + wxPyControlPoint * _arg1; double _arg2; double _arg3; int _arg4 = (int ) 0; @@ -6064,8 +7177,8 @@ static PyObject *_wrap_wxPyDrawnShape_base_OnSizingEndDragLeft(PyObject *self, P } 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 wxPyDrawnShape_base_OnSizingEndDragLeft. Expected _wxControlPoint_p."); + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyDrawnShape_base_OnSizingEndDragLeft. Expected _wxPyControlPoint_p."); return NULL; } } @@ -7677,7 +8790,7 @@ static PyObject *_wrap_wxPyCompositeShape_base_OnMoveLink(PyObject *self, PyObje static PyObject *_wrap_wxPyCompositeShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPyCompositeShape * _arg0; - wxControlPoint * _arg1; + wxPyControlPoint * _arg1; bool _arg2; double _arg3; double _arg4; @@ -7700,8 +8813,8 @@ static PyObject *_wrap_wxPyCompositeShape_base_OnSizingDragLeft(PyObject *self, } 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 wxPyCompositeShape_base_OnSizingDragLeft. Expected _wxControlPoint_p."); + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyCompositeShape_base_OnSizingDragLeft. Expected _wxPyControlPoint_p."); return NULL; } } @@ -7720,7 +8833,7 @@ static PyObject *_wrap_wxPyCompositeShape_base_OnSizingDragLeft(PyObject *self, static PyObject *_wrap_wxPyCompositeShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPyCompositeShape * _arg0; - wxControlPoint * _arg1; + wxPyControlPoint * _arg1; double _arg2; double _arg3; int _arg4 = (int ) 0; @@ -7741,8 +8854,8 @@ static PyObject *_wrap_wxPyCompositeShape_base_OnSizingBeginDragLeft(PyObject *s } 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 wxPyCompositeShape_base_OnSizingBeginDragLeft. Expected _wxControlPoint_p."); + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyCompositeShape_base_OnSizingBeginDragLeft. Expected _wxPyControlPoint_p."); return NULL; } } @@ -7760,7 +8873,7 @@ static PyObject *_wrap_wxPyCompositeShape_base_OnSizingBeginDragLeft(PyObject *s static PyObject *_wrap_wxPyCompositeShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPyCompositeShape * _arg0; - wxControlPoint * _arg1; + wxPyControlPoint * _arg1; double _arg2; double _arg3; int _arg4 = (int ) 0; @@ -7781,8 +8894,8 @@ static PyObject *_wrap_wxPyCompositeShape_base_OnSizingEndDragLeft(PyObject *sel } 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 wxPyCompositeShape_base_OnSizingEndDragLeft. Expected _wxControlPoint_p."); + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyCompositeShape_base_OnSizingEndDragLeft. Expected _wxPyControlPoint_p."); return NULL; } } @@ -8828,7 +9941,7 @@ static PyObject *_wrap_wxPyDividedShape_base_OnMoveLink(PyObject *self, PyObject static PyObject *_wrap_wxPyDividedShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPyDividedShape * _arg0; - wxControlPoint * _arg1; + wxPyControlPoint * _arg1; bool _arg2; double _arg3; double _arg4; @@ -8851,8 +9964,8 @@ static PyObject *_wrap_wxPyDividedShape_base_OnSizingDragLeft(PyObject *self, Py } 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 wxPyDividedShape_base_OnSizingDragLeft. Expected _wxControlPoint_p."); + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyDividedShape_base_OnSizingDragLeft. Expected _wxPyControlPoint_p."); return NULL; } } @@ -8871,7 +9984,7 @@ static PyObject *_wrap_wxPyDividedShape_base_OnSizingDragLeft(PyObject *self, Py static PyObject *_wrap_wxPyDividedShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPyDividedShape * _arg0; - wxControlPoint * _arg1; + wxPyControlPoint * _arg1; double _arg2; double _arg3; int _arg4 = (int ) 0; @@ -8892,8 +10005,8 @@ static PyObject *_wrap_wxPyDividedShape_base_OnSizingBeginDragLeft(PyObject *sel } 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 wxPyDividedShape_base_OnSizingBeginDragLeft. Expected _wxControlPoint_p."); + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyDividedShape_base_OnSizingBeginDragLeft. Expected _wxPyControlPoint_p."); return NULL; } } @@ -8911,7 +10024,7 @@ static PyObject *_wrap_wxPyDividedShape_base_OnSizingBeginDragLeft(PyObject *sel static PyObject *_wrap_wxPyDividedShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPyDividedShape * _arg0; - wxControlPoint * _arg1; + wxPyControlPoint * _arg1; double _arg2; double _arg3; int _arg4 = (int ) 0; @@ -8932,8 +10045,8 @@ static PyObject *_wrap_wxPyDividedShape_base_OnSizingEndDragLeft(PyObject *self, } 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 wxPyDividedShape_base_OnSizingEndDragLeft. Expected _wxControlPoint_p."); + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyDividedShape_base_OnSizingEndDragLeft. Expected _wxPyControlPoint_p."); return NULL; } } @@ -10759,7 +11872,7 @@ static PyObject *_wrap_wxPyDivisionShape_base_OnMoveLink(PyObject *self, PyObjec static PyObject *_wrap_wxPyDivisionShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPyDivisionShape * _arg0; - wxControlPoint * _arg1; + wxPyControlPoint * _arg1; bool _arg2; double _arg3; double _arg4; @@ -10782,8 +11895,8 @@ static PyObject *_wrap_wxPyDivisionShape_base_OnSizingDragLeft(PyObject *self, P } 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 wxPyDivisionShape_base_OnSizingDragLeft. Expected _wxControlPoint_p."); + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyDivisionShape_base_OnSizingDragLeft. Expected _wxPyControlPoint_p."); return NULL; } } @@ -10802,7 +11915,7 @@ static PyObject *_wrap_wxPyDivisionShape_base_OnSizingDragLeft(PyObject *self, P static PyObject *_wrap_wxPyDivisionShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPyDivisionShape * _arg0; - wxControlPoint * _arg1; + wxPyControlPoint * _arg1; double _arg2; double _arg3; int _arg4 = (int ) 0; @@ -10823,8 +11936,8 @@ static PyObject *_wrap_wxPyDivisionShape_base_OnSizingBeginDragLeft(PyObject *se } 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 wxPyDivisionShape_base_OnSizingBeginDragLeft. Expected _wxControlPoint_p."); + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyDivisionShape_base_OnSizingBeginDragLeft. Expected _wxPyControlPoint_p."); return NULL; } } @@ -10842,7 +11955,7 @@ static PyObject *_wrap_wxPyDivisionShape_base_OnSizingBeginDragLeft(PyObject *se static PyObject *_wrap_wxPyDivisionShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxPyDivisionShape * _arg0; - wxControlPoint * _arg1; + wxPyControlPoint * _arg1; double _arg2; double _arg3; int _arg4 = (int ) 0; @@ -10863,8 +11976,8 @@ static PyObject *_wrap_wxPyDivisionShape_base_OnSizingEndDragLeft(PyObject *self } 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 wxPyDivisionShape_base_OnSizingEndDragLeft. Expected _wxControlPoint_p."); + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxPyControlPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyDivisionShape_base_OnSizingEndDragLeft. Expected _wxPyControlPoint_p."); return NULL; } } @@ -11169,6 +12282,38 @@ static PyMethodDef oglshapescMethods[] = { { "wxPyBitmapShape_GetBitmap", (PyCFunction) _wrap_wxPyBitmapShape_GetBitmap, METH_VARARGS | METH_KEYWORDS }, { "wxPyBitmapShape__setSelf", (PyCFunction) _wrap_wxPyBitmapShape__setSelf, METH_VARARGS | METH_KEYWORDS }, { "new_wxPyBitmapShape", (PyCFunction) _wrap_new_wxPyBitmapShape, METH_VARARGS | METH_KEYWORDS }, + { "wxPyControlPoint_base_OnEndSize", (PyCFunction) _wrap_wxPyControlPoint_base_OnEndSize, METH_VARARGS | METH_KEYWORDS }, + { "wxPyControlPoint_base_OnBeginSize", (PyCFunction) _wrap_wxPyControlPoint_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS }, + { "wxPyControlPoint_base_OnSizingEndDragLeft", (PyCFunction) _wrap_wxPyControlPoint_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS }, + { "wxPyControlPoint_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_wxPyControlPoint_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS }, + { "wxPyControlPoint_base_OnSizingDragLeft", (PyCFunction) _wrap_wxPyControlPoint_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS }, + { "wxPyControlPoint_base_OnMoveLink", (PyCFunction) _wrap_wxPyControlPoint_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS }, + { "wxPyControlPoint_base_OnEraseControlPoints", (PyCFunction) _wrap_wxPyControlPoint_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS }, + { "wxPyControlPoint_base_OnDrawControlPoints", (PyCFunction) _wrap_wxPyControlPoint_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS }, + { "wxPyControlPoint_base_OnDrawOutline", (PyCFunction) _wrap_wxPyControlPoint_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS }, + { "wxPyControlPoint_base_OnEndDragRight", (PyCFunction) _wrap_wxPyControlPoint_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS }, + { "wxPyControlPoint_base_OnBeginDragRight", (PyCFunction) _wrap_wxPyControlPoint_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS }, + { "wxPyControlPoint_base_OnDragRight", (PyCFunction) _wrap_wxPyControlPoint_base_OnDragRight, METH_VARARGS | METH_KEYWORDS }, + { "wxPyControlPoint_base_OnEndDragLeft", (PyCFunction) _wrap_wxPyControlPoint_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS }, + { "wxPyControlPoint_base_OnBeginDragLeft", (PyCFunction) _wrap_wxPyControlPoint_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS }, + { "wxPyControlPoint_base_OnDragLeft", (PyCFunction) _wrap_wxPyControlPoint_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS }, + { "wxPyControlPoint_base_OnMovePost", (PyCFunction) _wrap_wxPyControlPoint_base_OnMovePost, METH_VARARGS | METH_KEYWORDS }, + { "wxPyControlPoint_base_OnMovePre", (PyCFunction) _wrap_wxPyControlPoint_base_OnMovePre, METH_VARARGS | METH_KEYWORDS }, + { "wxPyControlPoint_base_OnSize", (PyCFunction) _wrap_wxPyControlPoint_base_OnSize, METH_VARARGS | METH_KEYWORDS }, + { "wxPyControlPoint_base_OnRightClick", (PyCFunction) _wrap_wxPyControlPoint_base_OnRightClick, METH_VARARGS | METH_KEYWORDS }, + { "wxPyControlPoint_base_OnLeftDoubleClick", (PyCFunction) _wrap_wxPyControlPoint_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS }, + { "wxPyControlPoint_base_OnLeftClick", (PyCFunction) _wrap_wxPyControlPoint_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS }, + { "wxPyControlPoint_base_OnHighlight", (PyCFunction) _wrap_wxPyControlPoint_base_OnHighlight, METH_VARARGS | METH_KEYWORDS }, + { "wxPyControlPoint_base_OnEraseContents", (PyCFunction) _wrap_wxPyControlPoint_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS }, + { "wxPyControlPoint_base_OnErase", (PyCFunction) _wrap_wxPyControlPoint_base_OnErase, METH_VARARGS | METH_KEYWORDS }, + { "wxPyControlPoint_base_OnMoveLinks", (PyCFunction) _wrap_wxPyControlPoint_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS }, + { "wxPyControlPoint_base_OnDrawBranches", (PyCFunction) _wrap_wxPyControlPoint_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS }, + { "wxPyControlPoint_base_OnDrawContents", (PyCFunction) _wrap_wxPyControlPoint_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS }, + { "wxPyControlPoint_base_OnDraw", (PyCFunction) _wrap_wxPyControlPoint_base_OnDraw, METH_VARARGS | METH_KEYWORDS }, + { "wxPyControlPoint_base_OnDelete", (PyCFunction) _wrap_wxPyControlPoint_base_OnDelete, METH_VARARGS | METH_KEYWORDS }, + { "wxPyControlPoint_SetCornerRadius", (PyCFunction) _wrap_wxPyControlPoint_SetCornerRadius, METH_VARARGS | METH_KEYWORDS }, + { "wxPyControlPoint__setSelf", (PyCFunction) _wrap_wxPyControlPoint__setSelf, METH_VARARGS | METH_KEYWORDS }, + { "new_wxPyControlPoint", (PyCFunction) _wrap_new_wxPyControlPoint, METH_VARARGS | METH_KEYWORDS }, { "wxPyRectangleShape_base_OnEndSize", (PyCFunction) _wrap_wxPyRectangleShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS }, { "wxPyRectangleShape_base_OnBeginSize", (PyCFunction) _wrap_wxPyRectangleShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS }, { "wxPyRectangleShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_wxPyRectangleShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS }, @@ -11259,6 +12404,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}, @@ -11273,9 +12419,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_wxPyDivisionShape",SwigwxPyDivisionShapeTowxPyCompositeShape}, { "_wxPyCompositeShape","_wxPyDivisionShape",SwigwxPyDivisionShapeTowxPyCompositeShape}, { "_wxPyCompositeShape","_class_wxPyCompositeShape",0}, @@ -11293,6 +12441,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxPyRectangleShape","_wxPyDrawnShape",SwigwxPyDrawnShapeTowxPyRectangleShape}, { "_class_wxPyRectangleShape","_class_wxPyBitmapShape",SwigwxPyBitmapShapeTowxPyRectangleShape}, { "_class_wxPyRectangleShape","_wxPyBitmapShape",SwigwxPyBitmapShapeTowxPyRectangleShape}, + { "_class_wxPyRectangleShape","_class_wxPyControlPoint",SwigwxPyControlPointTowxPyRectangleShape}, + { "_class_wxPyRectangleShape","_wxPyControlPoint",SwigwxPyControlPointTowxPyRectangleShape}, { "_class_wxPyRectangleShape","_wxPyRectangleShape",0}, { "_class_wxTreeCtrl","_wxTreeCtrl",0}, { "_wxMask","_class_wxMask",0}, @@ -11320,11 +12470,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}, @@ -11339,6 +12491,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_wxPyDivisionShape",SwigwxPyDivisionShapeTowxPyShapeEvtHandler}, { "_class_wxPyShapeEvtHandler","_wxPyDivisionShape",SwigwxPyDivisionShapeTowxPyShapeEvtHandler}, { "_class_wxPyShapeEvtHandler","_class_wxPyDividedShape",SwigwxPyDividedShapeTowxPyShapeEvtHandler}, @@ -11349,6 +12502,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxPyShapeEvtHandler","_wxPyDrawnShape",SwigwxPyDrawnShapeTowxPyShapeEvtHandler}, { "_class_wxPyShapeEvtHandler","_class_wxPyBitmapShape",SwigwxPyBitmapShapeTowxPyShapeEvtHandler}, { "_class_wxPyShapeEvtHandler","_wxPyBitmapShape",SwigwxPyBitmapShapeTowxPyShapeEvtHandler}, + { "_class_wxPyShapeEvtHandler","_class_wxPyControlPoint",SwigwxPyControlPointTowxPyShapeEvtHandler}, + { "_class_wxPyShapeEvtHandler","_wxPyControlPoint",SwigwxPyControlPointTowxPyShapeEvtHandler}, { "_class_wxPyShapeEvtHandler","_class_wxPyRectangleShape",SwigwxPyRectangleShapeTowxPyShapeEvtHandler}, { "_class_wxPyShapeEvtHandler","_wxPyRectangleShape",SwigwxPyRectangleShapeTowxPyShapeEvtHandler}, { "_class_wxPyShapeEvtHandler","_wxPyShapeEvtHandler",0}, @@ -11357,10 +12512,10 @@ 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","_class_wxPyDivisionShape",SwigwxPyDivisionShapeTowxPyCompositeShape}, { "_class_wxPyCompositeShape","_wxPyDivisionShape",SwigwxPyDivisionShapeTowxPyCompositeShape}, { "_class_wxPyCompositeShape","_wxPyCompositeShape",0}, - { "_class_wxPostScriptDC","_wxPostScriptDC",0}, { "_wxPanel","_class_wxPanel",0}, { "_wxInitDialogEvent","_class_wxInitDialogEvent",0}, { "_wxCheckBox","_class_wxCheckBox",0}, @@ -11406,9 +12561,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}, @@ -11470,6 +12628,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}, @@ -11500,10 +12659,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}, @@ -11512,7 +12674,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_wxPyDivisionShape",SwigwxPyDivisionShapeTowxPyShape}, { "_wxPyShape","_wxPyDivisionShape",SwigwxPyDivisionShapeTowxPyShape}, @@ -11524,12 +12685,15 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxPyShape","_wxPyDrawnShape",SwigwxPyDrawnShapeTowxPyShape}, { "_wxPyShape","_class_wxPyBitmapShape",SwigwxPyBitmapShapeTowxPyShape}, { "_wxPyShape","_wxPyBitmapShape",SwigwxPyBitmapShapeTowxPyShape}, + { "_wxPyShape","_class_wxPyControlPoint",SwigwxPyControlPointTowxPyShape}, + { "_wxPyShape","_wxPyControlPoint",SwigwxPyControlPointTowxPyShape}, { "_wxPyShape","_class_wxPyRectangleShape",SwigwxPyRectangleShapeTowxPyShape}, { "_wxPyShape","_wxPyRectangleShape",SwigwxPyRectangleShapeTowxPyShape}, { "_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}, @@ -11568,6 +12732,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}, @@ -11576,6 +12741,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}, @@ -11583,8 +12749,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}, @@ -11600,6 +12768,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxPyShape","_wxPyDrawnShape",SwigwxPyDrawnShapeTowxPyShape}, { "_class_wxPyShape","_class_wxPyBitmapShape",SwigwxPyBitmapShapeTowxPyShape}, { "_class_wxPyShape","_wxPyBitmapShape",SwigwxPyBitmapShapeTowxPyShape}, + { "_class_wxPyShape","_class_wxPyControlPoint",SwigwxPyControlPointTowxPyShape}, + { "_class_wxPyShape","_wxPyControlPoint",SwigwxPyControlPointTowxPyShape}, { "_class_wxPyShape","_class_wxPyRectangleShape",SwigwxPyRectangleShapeTowxPyShape}, { "_class_wxPyShape","_wxPyRectangleShape",SwigwxPyRectangleShapeTowxPyShape}, { "_class_wxPyShape","_wxPyShape",0}, @@ -11623,6 +12793,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}, @@ -11650,6 +12821,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxPyShapeEvtHandler","_wxPyDrawnShape",SwigwxPyDrawnShapeTowxPyShapeEvtHandler}, { "_wxPyShapeEvtHandler","_class_wxPyBitmapShape",SwigwxPyBitmapShapeTowxPyShapeEvtHandler}, { "_wxPyShapeEvtHandler","_wxPyBitmapShape",SwigwxPyBitmapShapeTowxPyShapeEvtHandler}, + { "_wxPyShapeEvtHandler","_class_wxPyControlPoint",SwigwxPyControlPointTowxPyShapeEvtHandler}, + { "_wxPyShapeEvtHandler","_wxPyControlPoint",SwigwxPyControlPointTowxPyShapeEvtHandler}, { "_wxPyShapeEvtHandler","_class_wxPyRectangleShape",SwigwxPyRectangleShapeTowxPyShapeEvtHandler}, { "_wxPyShapeEvtHandler","_wxPyRectangleShape",SwigwxPyRectangleShapeTowxPyShapeEvtHandler}, { "_wxPyShapeEvtHandler","_class_wxPyShapeEvtHandler",0}, @@ -11670,6 +12843,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxPyRectangleShape","_wxPyDrawnShape",SwigwxPyDrawnShapeTowxPyRectangleShape}, { "_wxPyRectangleShape","_class_wxPyBitmapShape",SwigwxPyBitmapShapeTowxPyRectangleShape}, { "_wxPyRectangleShape","_wxPyBitmapShape",SwigwxPyBitmapShapeTowxPyRectangleShape}, + { "_wxPyRectangleShape","_class_wxPyControlPoint",SwigwxPyControlPointTowxPyRectangleShape}, + { "_wxPyRectangleShape","_wxPyControlPoint",SwigwxPyControlPointTowxPyRectangleShape}, { "_wxPyRectangleShape","_class_wxPyRectangleShape",0}, { "_class_wxScrolledWindow","_wxScrolledWindow",0}, { "_class_wxTextEntryDialog","_wxTextEntryDialog",0}, diff --git a/utils/wxPython/modules/ogl/oglshapes.i b/utils/wxPython/modules/ogl/oglshapes.i index fce7c5f1c1..2013e96245 100644 --- a/utils/wxPython/modules/ogl/oglshapes.i +++ b/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_OnSizingBeginDragLeft(wxControlPoint* 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_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); +}; + +//--------------------------------------------------------------------------- + +%{ + 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_OnSizingBeginDragLeft(wxControlPoint* 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_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); @@ -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_OnSizingBeginDragLeft(wxControlPoint* 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_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); @@ -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_OnSizingBeginDragLeft(wxControlPoint* 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_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); @@ -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_OnSizingBeginDragLeft(wxControlPoint* 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_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); @@ -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_OnSizingBeginDragLeft(wxControlPoint* 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_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); diff --git a/utils/wxPython/modules/ogl/oglshapes.py b/utils/wxPython/modules/ogl/oglshapes.py index 19c33611f3..027ab140cb 100644 --- a/utils/wxPython/modules/ogl/oglshapes.py +++ b/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 "" % (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 diff --git a/utils/wxPython/modules/ogl/oglshapes2.cpp b/utils/wxPython/modules/ogl/oglshapes2.cpp index 7c62de3fe8..132d38778d 100644 --- a/utils/wxPython/modules/ogl/oglshapes2.cpp +++ b/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")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyEllipseShape_base_OnSizingDragLeft. Expected _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 _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")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyEllipseShape_base_OnSizingBeginDragLeft. Expected _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 _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")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyEllipseShape_base_OnSizingEndDragLeft. Expected _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 _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")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyCircleShape_base_OnSizingDragLeft. Expected _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 _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")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyCircleShape_base_OnSizingBeginDragLeft. Expected _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 _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")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyCircleShape_base_OnSizingEndDragLeft. Expected _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 _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")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyLineShape_base_OnSizingDragLeft. Expected _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 _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")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyLineShape_base_OnSizingBeginDragLeft. Expected _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 _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")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyLineShape_base_OnSizingEndDragLeft. Expected _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 _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")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyPolygonShape_base_OnSizingDragLeft. Expected _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 _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")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyPolygonShape_base_OnSizingBeginDragLeft. Expected _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 _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")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyPolygonShape_base_OnSizingEndDragLeft. Expected _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 _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")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyTextShape_base_OnSizingDragLeft. Expected _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 _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")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyTextShape_base_OnSizingBeginDragLeft. Expected _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 _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")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyTextShape_base_OnSizingEndDragLeft. Expected _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 _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}, diff --git a/utils/wxPython/modules/ogl/oglshapes2.i b/utils/wxPython/modules/ogl/oglshapes2.i index e247d1286b..85c19e1d5a 100644 --- a/utils/wxPython/modules/ogl/oglshapes2.i +++ b/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_OnSizingBeginDragLeft(wxControlPoint* 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_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); @@ -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_OnSizingBeginDragLeft(wxControlPoint* 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_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); @@ -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_OnSizingBeginDragLeft(wxControlPoint* 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_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); @@ -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_OnSizingBeginDragLeft(wxControlPoint* 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_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); @@ -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_OnSizingBeginDragLeft(wxControlPoint* 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_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); diff --git a/utils/wxPython/modules/ogl/oglshapes2.py b/utils/wxPython/modules/ogl/oglshapes2.py index 8a60203ab3..ca583f90b3 100644 --- a/utils/wxPython/modules/ogl/oglshapes2.py +++ b/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 * -- 2.45.2