X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d03fd34d3cca63ba73cee48271eda244ceb98337..b1f29bf76f19e1a0adbd7ba108f275469dad445e:/wxPython/contrib/ogl/msw/ogl.py?ds=sidebyside diff --git a/wxPython/contrib/ogl/msw/ogl.py b/wxPython/contrib/ogl/msw/ogl.py index f01d3b9400..78dd91288b 100644 --- a/wxPython/contrib/ogl/msw/ogl.py +++ b/wxPython/contrib/ogl/msw/ogl.py @@ -3,130 +3,131 @@ import _ogl -import windows -import core -wx = core +import _windows +import _core +wx = _core +__docfilter__ = wx.__DocFilter(globals()) #--------------------------------------------------------------------------- -class ShapeRegion(core.Object): +class ShapeRegion(_core.Object): def __repr__(self): return "<%s.%s; proxy of C++ wxShapeRegion instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): - """__init__() -> ShapeRegion""" + """__init__(self) -> ShapeRegion""" newobj = _ogl.new_ShapeRegion(*args, **kwargs) self.this = newobj.this self.thisown = 1 del newobj.thisown def SetText(*args, **kwargs): - """SetText(String s)""" + """SetText(self, String s)""" return _ogl.ShapeRegion_SetText(*args, **kwargs) def SetFont(*args, **kwargs): - """SetFont(Font f)""" + """SetFont(self, Font f)""" return _ogl.ShapeRegion_SetFont(*args, **kwargs) def SetMinSize(*args, **kwargs): - """SetMinSize(double w, double h)""" + """SetMinSize(self, double w, double h)""" return _ogl.ShapeRegion_SetMinSize(*args, **kwargs) def SetSize(*args, **kwargs): - """SetSize(double w, double h)""" + """SetSize(self, double w, double h)""" return _ogl.ShapeRegion_SetSize(*args, **kwargs) def SetPosition(*args, **kwargs): - """SetPosition(double x, double y)""" + """SetPosition(self, double x, double y)""" return _ogl.ShapeRegion_SetPosition(*args, **kwargs) def SetProportions(*args, **kwargs): - """SetProportions(double x, double y)""" + """SetProportions(self, double x, double y)""" return _ogl.ShapeRegion_SetProportions(*args, **kwargs) def SetFormatMode(*args, **kwargs): - """SetFormatMode(int mode)""" + """SetFormatMode(self, int mode)""" return _ogl.ShapeRegion_SetFormatMode(*args, **kwargs) def SetName(*args, **kwargs): - """SetName(String s)""" + """SetName(self, String s)""" return _ogl.ShapeRegion_SetName(*args, **kwargs) def SetColour(*args, **kwargs): - """SetColour(String col)""" + """SetColour(self, String col)""" return _ogl.ShapeRegion_SetColour(*args, **kwargs) def GetText(*args, **kwargs): - """GetText() -> String""" + """GetText(self) -> String""" return _ogl.ShapeRegion_GetText(*args, **kwargs) def GetFont(*args, **kwargs): - """GetFont() -> Font""" + """GetFont(self) -> Font""" return _ogl.ShapeRegion_GetFont(*args, **kwargs) def GetMinSize(*args, **kwargs): - """GetMinSize(double OUTPUT, double OUTPUT)""" + """GetMinSize(self, double OUTPUT, double OUTPUT)""" return _ogl.ShapeRegion_GetMinSize(*args, **kwargs) def GetProportion(*args, **kwargs): - """GetProportion(double OUTPUT, double OUTPUT)""" + """GetProportion(self, double OUTPUT, double OUTPUT)""" return _ogl.ShapeRegion_GetProportion(*args, **kwargs) def GetSize(*args, **kwargs): - """GetSize(double OUTPUT, double OUTPUT)""" + """GetSize(self, double OUTPUT, double OUTPUT)""" return _ogl.ShapeRegion_GetSize(*args, **kwargs) def GetPosition(*args, **kwargs): - """GetPosition(double OUTPUT, double OUTPUT)""" + """GetPosition(self, double OUTPUT, double OUTPUT)""" return _ogl.ShapeRegion_GetPosition(*args, **kwargs) def GetFormatMode(*args, **kwargs): - """GetFormatMode() -> int""" + """GetFormatMode(self) -> int""" return _ogl.ShapeRegion_GetFormatMode(*args, **kwargs) def GetName(*args, **kwargs): - """GetName() -> String""" + """GetName(self) -> String""" return _ogl.ShapeRegion_GetName(*args, **kwargs) def GetColour(*args, **kwargs): - """GetColour() -> String""" + """GetColour(self) -> String""" return _ogl.ShapeRegion_GetColour(*args, **kwargs) def GetActualColourObject(*args, **kwargs): - """GetActualColourObject() -> Colour""" + """GetActualColourObject(self) -> Colour""" return _ogl.ShapeRegion_GetActualColourObject(*args, **kwargs) def GetFormattedText(*args, **kwargs): - """GetFormattedText() -> wxList""" + """GetFormattedText(self) -> wxList""" return _ogl.ShapeRegion_GetFormattedText(*args, **kwargs) def GetPenColour(*args, **kwargs): - """GetPenColour() -> String""" + """GetPenColour(self) -> String""" return _ogl.ShapeRegion_GetPenColour(*args, **kwargs) def GetPenStyle(*args, **kwargs): - """GetPenStyle() -> int""" + """GetPenStyle(self) -> int""" return _ogl.ShapeRegion_GetPenStyle(*args, **kwargs) def SetPenStyle(*args, **kwargs): - """SetPenStyle(int style)""" + """SetPenStyle(self, int style)""" return _ogl.ShapeRegion_SetPenStyle(*args, **kwargs) def SetPenColour(*args, **kwargs): - """SetPenColour(String col)""" + """SetPenColour(self, String col)""" return _ogl.ShapeRegion_SetPenColour(*args, **kwargs) def GetActualPen(*args, **kwargs): - """GetActualPen() -> wxPen""" + """GetActualPen(self) -> wxPen""" return _ogl.ShapeRegion_GetActualPen(*args, **kwargs) def GetWidth(*args, **kwargs): - """GetWidth() -> double""" + """GetWidth(self) -> double""" return _ogl.ShapeRegion_GetWidth(*args, **kwargs) def GetHeight(*args, **kwargs): - """GetHeight() -> double""" + """GetHeight(self) -> double""" return _ogl.ShapeRegion_GetHeight(*args, **kwargs) def ClearText(*args, **kwargs): - """ClearText()""" + """ClearText(self)""" return _ogl.ShapeRegion_ClearText(*args, **kwargs) @@ -137,11 +138,31 @@ class ShapeRegionPtr(ShapeRegion): self.__class__ = ShapeRegion _ogl.ShapeRegion_swigregister(ShapeRegionPtr) -class PyShapeEvtHandler(core.Object): +class AttachmentPoint(_core.Object): + def __repr__(self): + return "<%s.%s; proxy of C++ wxAttachmentPoint instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) + def __init__(self, *args, **kwargs): + """__init__(self, int id=0, double x=0.0, double y=0.0) -> AttachmentPoint""" + newobj = _ogl.new_AttachmentPoint(*args, **kwargs) + self.this = newobj.this + self.thisown = 1 + del newobj.thisown + m_id = property(_ogl.AttachmentPoint_m_id_get, _ogl.AttachmentPoint_m_id_set) + m_x = property(_ogl.AttachmentPoint_m_x_get, _ogl.AttachmentPoint_m_x_set) + m_y = property(_ogl.AttachmentPoint_m_y_get, _ogl.AttachmentPoint_m_y_set) + +class AttachmentPointPtr(AttachmentPoint): + def __init__(self, this): + self.this = this + if not hasattr(self,"thisown"): self.thisown = 0 + self.__class__ = AttachmentPoint +_ogl.AttachmentPoint_swigregister(AttachmentPointPtr) + +class PyShapeEvtHandler(_core.Object): def __repr__(self): return "<%s.%s; proxy of C++ wxPyShapeEvtHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): - """__init__(PyShapeEvtHandler prev=None, PyShape shape=None) -> PyShapeEvtHandler""" + """__init__(self, PyShapeEvtHandler prev=None, PyShape shape=None) -> PyShapeEvtHandler""" newobj = _ogl.new_PyShapeEvtHandler(*args, **kwargs) self.this = newobj.this self.thisown = 1 @@ -149,11 +170,11 @@ class PyShapeEvtHandler(core.Object): self._setOORandCallbackInfo(PyShapeEvtHandler) def _setCallbackInfo(*args, **kwargs): - """_setCallbackInfo(PyObject self, PyObject _class)""" + """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _ogl.PyShapeEvtHandler__setCallbackInfo(*args, **kwargs) def _setOORInfo(*args, **kwargs): - """_setOORInfo(PyObject _self)""" + """_setOORInfo(self, PyObject _self)""" return _ogl.PyShapeEvtHandler__setOORInfo(*args, **kwargs) def _setOORandCallbackInfo(self, _class): @@ -161,154 +182,154 @@ class PyShapeEvtHandler(core.Object): self._setCallbackInfo(self, _class) def SetShape(*args, **kwargs): - """SetShape(PyShape sh)""" + """SetShape(self, PyShape sh)""" return _ogl.PyShapeEvtHandler_SetShape(*args, **kwargs) def GetShape(*args, **kwargs): - """GetShape() -> PyShape""" + """GetShape(self) -> PyShape""" return _ogl.PyShapeEvtHandler_GetShape(*args, **kwargs) def SetPreviousHandler(*args, **kwargs): - """SetPreviousHandler(PyShapeEvtHandler handler)""" + """SetPreviousHandler(self, PyShapeEvtHandler handler)""" return _ogl.PyShapeEvtHandler_SetPreviousHandler(*args, **kwargs) def GetPreviousHandler(*args, **kwargs): - """GetPreviousHandler() -> PyShapeEvtHandler""" + """GetPreviousHandler(self) -> PyShapeEvtHandler""" return _ogl.PyShapeEvtHandler_GetPreviousHandler(*args, **kwargs) def CreateNewCopy(*args, **kwargs): - """CreateNewCopy() -> PyShapeEvtHandler""" + """CreateNewCopy(self) -> PyShapeEvtHandler""" return _ogl.PyShapeEvtHandler_CreateNewCopy(*args, **kwargs) def base_OnDelete(*args, **kwargs): - """base_OnDelete()""" + """base_OnDelete(self)""" return _ogl.PyShapeEvtHandler_base_OnDelete(*args, **kwargs) def base_OnDraw(*args, **kwargs): - """base_OnDraw(DC dc)""" + """base_OnDraw(self, DC dc)""" return _ogl.PyShapeEvtHandler_base_OnDraw(*args, **kwargs) def base_OnDrawContents(*args, **kwargs): - """base_OnDrawContents(DC dc)""" + """base_OnDrawContents(self, DC dc)""" return _ogl.PyShapeEvtHandler_base_OnDrawContents(*args, **kwargs) def base_OnDrawBranches(*args, **kwargs): - """base_OnDrawBranches(DC dc, bool erase=False)""" + """base_OnDrawBranches(self, DC dc, bool erase=False)""" return _ogl.PyShapeEvtHandler_base_OnDrawBranches(*args, **kwargs) def base_OnMoveLinks(*args, **kwargs): - """base_OnMoveLinks(DC dc)""" + """base_OnMoveLinks(self, DC dc)""" return _ogl.PyShapeEvtHandler_base_OnMoveLinks(*args, **kwargs) def base_OnErase(*args, **kwargs): - """base_OnErase(DC dc)""" + """base_OnErase(self, DC dc)""" return _ogl.PyShapeEvtHandler_base_OnErase(*args, **kwargs) def base_OnEraseContents(*args, **kwargs): - """base_OnEraseContents(DC dc)""" + """base_OnEraseContents(self, DC dc)""" return _ogl.PyShapeEvtHandler_base_OnEraseContents(*args, **kwargs) def base_OnHighlight(*args, **kwargs): - """base_OnHighlight(DC dc)""" + """base_OnHighlight(self, DC dc)""" return _ogl.PyShapeEvtHandler_base_OnHighlight(*args, **kwargs) def base_OnLeftClick(*args, **kwargs): - """base_OnLeftClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnLeftClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyShapeEvtHandler_base_OnLeftClick(*args, **kwargs) def base_OnLeftDoubleClick(*args, **kwargs): - """base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnLeftDoubleClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyShapeEvtHandler_base_OnLeftDoubleClick(*args, **kwargs) def base_OnRightClick(*args, **kwargs): - """base_OnRightClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnRightClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyShapeEvtHandler_base_OnRightClick(*args, **kwargs) def base_OnSize(*args, **kwargs): - """base_OnSize(double x, double y)""" + """base_OnSize(self, double x, double y)""" return _ogl.PyShapeEvtHandler_base_OnSize(*args, **kwargs) def base_OnMovePre(*args, **kwargs): """ - base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, + base_OnMovePre(self, DC dc, double x, double y, double old_x, double old_y, bool display=True) -> bool """ return _ogl.PyShapeEvtHandler_base_OnMovePre(*args, **kwargs) def base_OnMovePost(*args, **kwargs): """ - base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, + base_OnMovePost(self, DC dc, double x, double y, double old_x, double old_y, bool display=True) """ return _ogl.PyShapeEvtHandler_base_OnMovePost(*args, **kwargs) def base_OnDragLeft(*args, **kwargs): - """base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)""" + """base_OnDragLeft(self, bool draw, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyShapeEvtHandler_base_OnDragLeft(*args, **kwargs) def base_OnBeginDragLeft(*args, **kwargs): - """base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)""" + """base_OnBeginDragLeft(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyShapeEvtHandler_base_OnBeginDragLeft(*args, **kwargs) def base_OnEndDragLeft(*args, **kwargs): - """base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)""" + """base_OnEndDragLeft(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyShapeEvtHandler_base_OnEndDragLeft(*args, **kwargs) def base_OnDragRight(*args, **kwargs): - """base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)""" + """base_OnDragRight(self, bool draw, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyShapeEvtHandler_base_OnDragRight(*args, **kwargs) def base_OnBeginDragRight(*args, **kwargs): - """base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)""" + """base_OnBeginDragRight(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyShapeEvtHandler_base_OnBeginDragRight(*args, **kwargs) def base_OnEndDragRight(*args, **kwargs): - """base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)""" + """base_OnEndDragRight(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyShapeEvtHandler_base_OnEndDragRight(*args, **kwargs) def base_OnDrawOutline(*args, **kwargs): - """base_OnDrawOutline(DC dc, double x, double y, double w, double h)""" + """base_OnDrawOutline(self, DC dc, double x, double y, double w, double h)""" return _ogl.PyShapeEvtHandler_base_OnDrawOutline(*args, **kwargs) def base_OnDrawControlPoints(*args, **kwargs): - """base_OnDrawControlPoints(DC dc)""" + """base_OnDrawControlPoints(self, DC dc)""" return _ogl.PyShapeEvtHandler_base_OnDrawControlPoints(*args, **kwargs) def base_OnEraseControlPoints(*args, **kwargs): - """base_OnEraseControlPoints(DC dc)""" + """base_OnEraseControlPoints(self, DC dc)""" return _ogl.PyShapeEvtHandler_base_OnEraseControlPoints(*args, **kwargs) def base_OnMoveLink(*args, **kwargs): - """base_OnMoveLink(DC dc, bool moveControlPoints=True)""" + """base_OnMoveLink(self, DC dc, bool moveControlPoints=True)""" return _ogl.PyShapeEvtHandler_base_OnMoveLink(*args, **kwargs) def base_OnSizingDragLeft(*args, **kwargs): """ - base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, + base_OnSizingDragLeft(self, PyControlPoint pt, bool draw, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyShapeEvtHandler_base_OnSizingDragLeft(*args, **kwargs) def base_OnSizingBeginDragLeft(*args, **kwargs): """ - base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, + base_OnSizingBeginDragLeft(self, PyControlPoint pt, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyShapeEvtHandler_base_OnSizingBeginDragLeft(*args, **kwargs) def base_OnSizingEndDragLeft(*args, **kwargs): """ - base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, + base_OnSizingEndDragLeft(self, PyControlPoint pt, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyShapeEvtHandler_base_OnSizingEndDragLeft(*args, **kwargs) def base_OnBeginSize(*args, **kwargs): - """base_OnBeginSize(double w, double h)""" + """base_OnBeginSize(self, double w, double h)""" return _ogl.PyShapeEvtHandler_base_OnBeginSize(*args, **kwargs) def base_OnEndSize(*args, **kwargs): - """base_OnEndSize(double w, double h)""" + """base_OnEndSize(self, double w, double h)""" return _ogl.PyShapeEvtHandler_base_OnEndSize(*args, **kwargs) @@ -323,7 +344,7 @@ class PyShape(PyShapeEvtHandler): def __repr__(self): return "<%s.%s; proxy of C++ wxPyShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): - """__init__(PyShapeCanvas can=None) -> PyShape""" + """__init__(self, PyShapeCanvas can=None) -> PyShape""" newobj = _ogl.new_PyShape(*args, **kwargs) self.this = newobj.this self.thisown = 1 @@ -331,242 +352,242 @@ class PyShape(PyShapeEvtHandler): self._setOORandCallbackInfo(PyShapeEvtHandler) def _setCallbackInfo(*args, **kwargs): - """_setCallbackInfo(PyObject self, PyObject _class)""" + """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _ogl.PyShape__setCallbackInfo(*args, **kwargs) def GetBoundingBoxMax(*args, **kwargs): - """GetBoundingBoxMax(double OUTPUT, double OUTPUT)""" + """GetBoundingBoxMax(self, double OUTPUT, double OUTPUT)""" return _ogl.PyShape_GetBoundingBoxMax(*args, **kwargs) def GetBoundingBoxMin(*args, **kwargs): - """GetBoundingBoxMin(double OUTPUT, double OUTPUT)""" + """GetBoundingBoxMin(self, double OUTPUT, double OUTPUT)""" return _ogl.PyShape_GetBoundingBoxMin(*args, **kwargs) def GetPerimeterPoint(*args, **kwargs): """ - GetPerimeterPoint(double x1, double y1, double x2, double y2, double OUTPUT, + GetPerimeterPoint(self, double x1, double y1, double x2, double y2, double OUTPUT, double OUTPUT) -> bool """ return _ogl.PyShape_GetPerimeterPoint(*args, **kwargs) def GetCanvas(*args, **kwargs): - """GetCanvas() -> PyShapeCanvas""" + """GetCanvas(self) -> PyShapeCanvas""" return _ogl.PyShape_GetCanvas(*args, **kwargs) def SetCanvas(*args, **kwargs): - """SetCanvas(PyShapeCanvas the_canvas)""" + """SetCanvas(self, PyShapeCanvas the_canvas)""" return _ogl.PyShape_SetCanvas(*args, **kwargs) def AddToCanvas(*args, **kwargs): - """AddToCanvas(PyShapeCanvas the_canvas, PyShape addAfter=None)""" + """AddToCanvas(self, PyShapeCanvas the_canvas, PyShape addAfter=None)""" return _ogl.PyShape_AddToCanvas(*args, **kwargs) def InsertInCanvas(*args, **kwargs): - """InsertInCanvas(PyShapeCanvas the_canvas)""" + """InsertInCanvas(self, PyShapeCanvas the_canvas)""" return _ogl.PyShape_InsertInCanvas(*args, **kwargs) def RemoveFromCanvas(*args, **kwargs): - """RemoveFromCanvas(PyShapeCanvas the_canvas)""" + """RemoveFromCanvas(self, PyShapeCanvas the_canvas)""" return _ogl.PyShape_RemoveFromCanvas(*args, **kwargs) def GetX(*args, **kwargs): - """GetX() -> double""" + """GetX(self) -> double""" return _ogl.PyShape_GetX(*args, **kwargs) def GetY(*args, **kwargs): - """GetY() -> double""" + """GetY(self) -> double""" return _ogl.PyShape_GetY(*args, **kwargs) def SetX(*args, **kwargs): - """SetX(double x)""" + """SetX(self, double x)""" return _ogl.PyShape_SetX(*args, **kwargs) def SetY(*args, **kwargs): - """SetY(double y)""" + """SetY(self, double y)""" return _ogl.PyShape_SetY(*args, **kwargs) def GetParent(*args, **kwargs): - """GetParent() -> PyShape""" + """GetParent(self) -> PyShape""" return _ogl.PyShape_GetParent(*args, **kwargs) def SetParent(*args, **kwargs): - """SetParent(PyShape p)""" + """SetParent(self, PyShape p)""" return _ogl.PyShape_SetParent(*args, **kwargs) def GetTopAncestor(*args, **kwargs): - """GetTopAncestor() -> PyShape""" + """GetTopAncestor(self) -> PyShape""" return _ogl.PyShape_GetTopAncestor(*args, **kwargs) def GetChildren(*args, **kwargs): - """GetChildren() -> PyObject""" + """GetChildren(self) -> PyObject""" return _ogl.PyShape_GetChildren(*args, **kwargs) def Unlink(*args, **kwargs): - """Unlink()""" + """Unlink(self)""" return _ogl.PyShape_Unlink(*args, **kwargs) def SetDrawHandles(*args, **kwargs): - """SetDrawHandles(bool drawH)""" + """SetDrawHandles(self, bool drawH)""" return _ogl.PyShape_SetDrawHandles(*args, **kwargs) def GetDrawHandles(*args, **kwargs): - """GetDrawHandles() -> bool""" + """GetDrawHandles(self) -> bool""" return _ogl.PyShape_GetDrawHandles(*args, **kwargs) def MakeControlPoints(*args, **kwargs): - """MakeControlPoints()""" + """MakeControlPoints(self)""" return _ogl.PyShape_MakeControlPoints(*args, **kwargs) def DeleteControlPoints(*args, **kwargs): - """DeleteControlPoints(DC dc=None)""" + """DeleteControlPoints(self, DC dc=None)""" return _ogl.PyShape_DeleteControlPoints(*args, **kwargs) def ResetControlPoints(*args, **kwargs): - """ResetControlPoints()""" + """ResetControlPoints(self)""" return _ogl.PyShape_ResetControlPoints(*args, **kwargs) def GetEventHandler(*args, **kwargs): - """GetEventHandler() -> PyShapeEvtHandler""" + """GetEventHandler(self) -> PyShapeEvtHandler""" return _ogl.PyShape_GetEventHandler(*args, **kwargs) def SetEventHandler(*args, **kwargs): - """SetEventHandler(PyShapeEvtHandler handler)""" + """SetEventHandler(self, PyShapeEvtHandler handler)""" return _ogl.PyShape_SetEventHandler(*args, **kwargs) def MakeMandatoryControlPoints(*args, **kwargs): - """MakeMandatoryControlPoints()""" + """MakeMandatoryControlPoints(self)""" return _ogl.PyShape_MakeMandatoryControlPoints(*args, **kwargs) def ResetMandatoryControlPoints(*args, **kwargs): - """ResetMandatoryControlPoints()""" + """ResetMandatoryControlPoints(self)""" return _ogl.PyShape_ResetMandatoryControlPoints(*args, **kwargs) def Recompute(*args, **kwargs): - """Recompute() -> bool""" + """Recompute(self) -> bool""" return _ogl.PyShape_Recompute(*args, **kwargs) def CalculateSize(*args, **kwargs): - """CalculateSize()""" + """CalculateSize(self)""" return _ogl.PyShape_CalculateSize(*args, **kwargs) def Select(*args, **kwargs): - """Select(bool select=True, DC dc=None)""" + """Select(self, bool select=True, DC dc=None)""" return _ogl.PyShape_Select(*args, **kwargs) def SetHighlight(*args, **kwargs): - """SetHighlight(bool hi=True, bool recurse=False)""" + """SetHighlight(self, bool hi=True, bool recurse=False)""" return _ogl.PyShape_SetHighlight(*args, **kwargs) def IsHighlighted(*args, **kwargs): - """IsHighlighted() -> bool""" + """IsHighlighted(self) -> bool""" return _ogl.PyShape_IsHighlighted(*args, **kwargs) def Selected(*args, **kwargs): - """Selected() -> bool""" + """Selected(self) -> bool""" return _ogl.PyShape_Selected(*args, **kwargs) def AncestorSelected(*args, **kwargs): - """AncestorSelected() -> bool""" + """AncestorSelected(self) -> bool""" return _ogl.PyShape_AncestorSelected(*args, **kwargs) def SetSensitivityFilter(*args, **kwargs): - """SetSensitivityFilter(int sens=OP_ALL, bool recursive=False)""" + """SetSensitivityFilter(self, int sens=OP_ALL, bool recursive=False)""" return _ogl.PyShape_SetSensitivityFilter(*args, **kwargs) def GetSensitivityFilter(*args, **kwargs): - """GetSensitivityFilter() -> int""" + """GetSensitivityFilter(self) -> int""" return _ogl.PyShape_GetSensitivityFilter(*args, **kwargs) def SetDraggable(*args, **kwargs): - """SetDraggable(bool drag, bool recursive=False)""" + """SetDraggable(self, bool drag, bool recursive=False)""" return _ogl.PyShape_SetDraggable(*args, **kwargs) def SetFixedSize(*args, **kwargs): - """SetFixedSize(bool x, bool y)""" + """SetFixedSize(self, bool x, bool y)""" return _ogl.PyShape_SetFixedSize(*args, **kwargs) def GetFixedSize(*args, **kwargs): - """GetFixedSize(bool OUTPUT, bool OUTPUT)""" + """GetFixedSize(self, bool OUTPUT, bool OUTPUT)""" return _ogl.PyShape_GetFixedSize(*args, **kwargs) def GetFixedWidth(*args, **kwargs): - """GetFixedWidth() -> bool""" + """GetFixedWidth(self) -> bool""" return _ogl.PyShape_GetFixedWidth(*args, **kwargs) def GetFixedHeight(*args, **kwargs): - """GetFixedHeight() -> bool""" + """GetFixedHeight(self) -> bool""" return _ogl.PyShape_GetFixedHeight(*args, **kwargs) def SetSpaceAttachments(*args, **kwargs): - """SetSpaceAttachments(bool sp)""" + """SetSpaceAttachments(self, bool sp)""" return _ogl.PyShape_SetSpaceAttachments(*args, **kwargs) def GetSpaceAttachments(*args, **kwargs): - """GetSpaceAttachments() -> bool""" + """GetSpaceAttachments(self) -> bool""" return _ogl.PyShape_GetSpaceAttachments(*args, **kwargs) def SetShadowMode(*args, **kwargs): - """SetShadowMode(int mode, bool redraw=False)""" + """SetShadowMode(self, int mode, bool redraw=False)""" return _ogl.PyShape_SetShadowMode(*args, **kwargs) def GetShadowMode(*args, **kwargs): - """GetShadowMode() -> int""" + """GetShadowMode(self) -> int""" return _ogl.PyShape_GetShadowMode(*args, **kwargs) def HitTest(*args, **kwargs): - """HitTest(double x, double y, int OUTPUT, double OUTPUT) -> bool""" + """HitTest(self, double x, double y, int OUTPUT, double OUTPUT) -> bool""" return _ogl.PyShape_HitTest(*args, **kwargs) def SetCentreResize(*args, **kwargs): - """SetCentreResize(bool cr)""" + """SetCentreResize(self, bool cr)""" return _ogl.PyShape_SetCentreResize(*args, **kwargs) def GetCentreResize(*args, **kwargs): - """GetCentreResize() -> bool""" + """GetCentreResize(self) -> bool""" return _ogl.PyShape_GetCentreResize(*args, **kwargs) def SetMaintainAspectRatio(*args, **kwargs): - """SetMaintainAspectRatio(bool ar)""" + """SetMaintainAspectRatio(self, bool ar)""" return _ogl.PyShape_SetMaintainAspectRatio(*args, **kwargs) def GetMaintainAspectRatio(*args, **kwargs): - """GetMaintainAspectRatio() -> bool""" + """GetMaintainAspectRatio(self) -> bool""" return _ogl.PyShape_GetMaintainAspectRatio(*args, **kwargs) def GetLines(*args, **kwargs): - """GetLines() -> PyObject""" + """GetLines(self) -> PyObject""" return _ogl.PyShape_GetLines(*args, **kwargs) def SetDisableLabel(*args, **kwargs): - """SetDisableLabel(bool flag)""" + """SetDisableLabel(self, bool flag)""" return _ogl.PyShape_SetDisableLabel(*args, **kwargs) def GetDisableLabel(*args, **kwargs): - """GetDisableLabel() -> bool""" + """GetDisableLabel(self) -> bool""" return _ogl.PyShape_GetDisableLabel(*args, **kwargs) def SetAttachmentMode(*args, **kwargs): - """SetAttachmentMode(int mode)""" + """SetAttachmentMode(self, int mode)""" return _ogl.PyShape_SetAttachmentMode(*args, **kwargs) def GetAttachmentMode(*args, **kwargs): - """GetAttachmentMode() -> int""" + """GetAttachmentMode(self) -> int""" return _ogl.PyShape_GetAttachmentMode(*args, **kwargs) def SetId(*args, **kwargs): - """SetId(long i)""" + """SetId(self, long i)""" return _ogl.PyShape_SetId(*args, **kwargs) def GetId(*args, **kwargs): - """GetId() -> long""" + """GetId(self) -> long""" return _ogl.PyShape_GetId(*args, **kwargs) def SetPen(*args, **kwargs): - """SetPen(wxPen pen)""" + """SetPen(self, wxPen pen)""" return _ogl.PyShape_SetPen(*args, **kwargs) def SetBrush(*args, **kwargs): - """SetBrush(wxBrush brush)""" + """SetBrush(self, wxBrush brush)""" return _ogl.PyShape_SetBrush(*args, **kwargs) def SetClientData(self, data): @@ -578,453 +599,461 @@ class PyShape(PyShapeEvtHandler): return None def Show(*args, **kwargs): - """Show(bool show)""" + """Show(self, bool show)""" return _ogl.PyShape_Show(*args, **kwargs) def IsShown(*args, **kwargs): - """IsShown() -> bool""" + """IsShown(self) -> bool""" return _ogl.PyShape_IsShown(*args, **kwargs) def Move(*args, **kwargs): - """Move(DC dc, double x1, double y1, bool display=True)""" + """Move(self, DC dc, double x1, double y1, bool display=True)""" return _ogl.PyShape_Move(*args, **kwargs) def Erase(*args, **kwargs): - """Erase(DC dc)""" + """Erase(self, DC dc)""" return _ogl.PyShape_Erase(*args, **kwargs) def EraseContents(*args, **kwargs): - """EraseContents(DC dc)""" + """EraseContents(self, DC dc)""" return _ogl.PyShape_EraseContents(*args, **kwargs) def Draw(*args, **kwargs): - """Draw(DC dc)""" + """Draw(self, DC dc)""" return _ogl.PyShape_Draw(*args, **kwargs) def Flash(*args, **kwargs): - """Flash()""" + """Flash(self)""" return _ogl.PyShape_Flash(*args, **kwargs) def MoveLinks(*args, **kwargs): - """MoveLinks(DC dc)""" + """MoveLinks(self, DC dc)""" return _ogl.PyShape_MoveLinks(*args, **kwargs) def DrawContents(*args, **kwargs): - """DrawContents(DC dc)""" + """DrawContents(self, DC dc)""" return _ogl.PyShape_DrawContents(*args, **kwargs) def SetSize(*args, **kwargs): - """SetSize(double x, double y, bool recursive=True)""" + """SetSize(self, double x, double y, bool recursive=True)""" return _ogl.PyShape_SetSize(*args, **kwargs) def SetAttachmentSize(*args, **kwargs): - """SetAttachmentSize(double x, double y)""" + """SetAttachmentSize(self, double x, double y)""" return _ogl.PyShape_SetAttachmentSize(*args, **kwargs) def Attach(*args, **kwargs): - """Attach(PyShapeCanvas can)""" + """Attach(self, PyShapeCanvas can)""" return _ogl.PyShape_Attach(*args, **kwargs) def Detach(*args, **kwargs): - """Detach()""" + """Detach(self)""" return _ogl.PyShape_Detach(*args, **kwargs) def Constrain(*args, **kwargs): - """Constrain() -> bool""" + """Constrain(self) -> bool""" return _ogl.PyShape_Constrain(*args, **kwargs) def AddLine(*args, **kwargs): """ - AddLine(PyLineShape line, PyShape other, int attachFrom=0, + AddLine(self, PyLineShape line, PyShape other, int attachFrom=0, int attachTo=0, int positionFrom=-1, int positionTo=-1) """ return _ogl.PyShape_AddLine(*args, **kwargs) def GetLinePosition(*args, **kwargs): - """GetLinePosition(PyLineShape line) -> int""" + """GetLinePosition(self, PyLineShape line) -> int""" return _ogl.PyShape_GetLinePosition(*args, **kwargs) def AddText(*args, **kwargs): - """AddText(String string)""" + """AddText(self, String string)""" return _ogl.PyShape_AddText(*args, **kwargs) def GetPen(*args, **kwargs): - """GetPen() -> wxPen""" + """GetPen(self) -> wxPen""" return _ogl.PyShape_GetPen(*args, **kwargs) def GetBrush(*args, **kwargs): - """GetBrush() -> wxBrush""" + """GetBrush(self) -> wxBrush""" return _ogl.PyShape_GetBrush(*args, **kwargs) def SetDefaultRegionSize(*args, **kwargs): - """SetDefaultRegionSize()""" + """SetDefaultRegionSize(self)""" return _ogl.PyShape_SetDefaultRegionSize(*args, **kwargs) def FormatText(*args, **kwargs): - """FormatText(DC dc, String s, int regionId=0)""" + """FormatText(self, DC dc, String s, int regionId=0)""" return _ogl.PyShape_FormatText(*args, **kwargs) def SetFormatMode(*args, **kwargs): - """SetFormatMode(int mode, int regionId=0)""" + """SetFormatMode(self, int mode, int regionId=0)""" return _ogl.PyShape_SetFormatMode(*args, **kwargs) def GetFormatMode(*args, **kwargs): - """GetFormatMode(int regionId=0) -> int""" + """GetFormatMode(self, int regionId=0) -> int""" return _ogl.PyShape_GetFormatMode(*args, **kwargs) def SetFont(*args, **kwargs): - """SetFont(Font font, int regionId=0)""" + """SetFont(self, Font font, int regionId=0)""" return _ogl.PyShape_SetFont(*args, **kwargs) def GetFont(*args, **kwargs): - """GetFont(int regionId=0) -> Font""" + """GetFont(self, int regionId=0) -> Font""" return _ogl.PyShape_GetFont(*args, **kwargs) def SetTextColour(*args, **kwargs): - """SetTextColour(String colour, int regionId=0)""" + """SetTextColour(self, String colour, int regionId=0)""" return _ogl.PyShape_SetTextColour(*args, **kwargs) def GetTextColour(*args, **kwargs): - """GetTextColour(int regionId=0) -> String""" + """GetTextColour(self, int regionId=0) -> String""" return _ogl.PyShape_GetTextColour(*args, **kwargs) def GetNumberOfTextRegions(*args, **kwargs): - """GetNumberOfTextRegions() -> int""" + """GetNumberOfTextRegions(self) -> int""" return _ogl.PyShape_GetNumberOfTextRegions(*args, **kwargs) def SetRegionName(*args, **kwargs): - """SetRegionName(String name, int regionId=0)""" + """SetRegionName(self, String name, int regionId=0)""" return _ogl.PyShape_SetRegionName(*args, **kwargs) def GetRegionName(*args, **kwargs): - """GetRegionName(int regionId) -> String""" + """GetRegionName(self, int regionId) -> String""" return _ogl.PyShape_GetRegionName(*args, **kwargs) def GetRegionId(*args, **kwargs): - """GetRegionId(String name) -> int""" + """GetRegionId(self, String name) -> int""" return _ogl.PyShape_GetRegionId(*args, **kwargs) def NameRegions(*args, **kwargs): - """NameRegions(String parentName=EmptyString)""" + """NameRegions(self, String parentName=EmptyString)""" return _ogl.PyShape_NameRegions(*args, **kwargs) def GetRegions(*args, **kwargs): - """GetRegions() -> PyObject""" + """GetRegions(self) -> PyObject""" return _ogl.PyShape_GetRegions(*args, **kwargs) def AddRegion(*args, **kwargs): - """AddRegion(ShapeRegion region)""" + """AddRegion(self, ShapeRegion region)""" return _ogl.PyShape_AddRegion(*args, **kwargs) def ClearRegions(*args, **kwargs): - """ClearRegions()""" + """ClearRegions(self)""" return _ogl.PyShape_ClearRegions(*args, **kwargs) def AssignNewIds(*args, **kwargs): - """AssignNewIds()""" + """AssignNewIds(self)""" return _ogl.PyShape_AssignNewIds(*args, **kwargs) def FindRegion(*args, **kwargs): - """FindRegion(String regionName, int OUTPUT) -> PyShape""" + """FindRegion(self, String regionName, int OUTPUT) -> PyShape""" return _ogl.PyShape_FindRegion(*args, **kwargs) def FindRegionNames(*args, **kwargs): - """FindRegionNames(wxStringList list)""" + """FindRegionNames(self, wxStringList list)""" return _ogl.PyShape_FindRegionNames(*args, **kwargs) def ClearText(*args, **kwargs): - """ClearText(int regionId=0)""" + """ClearText(self, int regionId=0)""" return _ogl.PyShape_ClearText(*args, **kwargs) def RemoveLine(*args, **kwargs): - """RemoveLine(PyLineShape line)""" + """RemoveLine(self, PyLineShape line)""" return _ogl.PyShape_RemoveLine(*args, **kwargs) def GetAttachmentPosition(*args, **kwargs): """ - GetAttachmentPosition(int attachment, double OUTPUT, double OUTPUT, int nth=0, + GetAttachmentPosition(self, int attachment, double OUTPUT, double OUTPUT, int nth=0, int no_arcs=1, PyLineShape line=None) -> bool """ return _ogl.PyShape_GetAttachmentPosition(*args, **kwargs) def GetNumberOfAttachments(*args, **kwargs): - """GetNumberOfAttachments() -> int""" + """GetNumberOfAttachments(self) -> int""" return _ogl.PyShape_GetNumberOfAttachments(*args, **kwargs) def AttachmentIsValid(*args, **kwargs): - """AttachmentIsValid(int attachment) -> bool""" + """AttachmentIsValid(self, int attachment) -> bool""" return _ogl.PyShape_AttachmentIsValid(*args, **kwargs) + def GetAttachments(*args, **kwargs): + """GetAttachments(self) -> PyObject""" + return _ogl.PyShape_GetAttachments(*args, **kwargs) + def GetAttachmentPositionEdge(*args, **kwargs): """ - GetAttachmentPositionEdge(int attachment, double OUTPUT, double OUTPUT, int nth=0, + GetAttachmentPositionEdge(self, int attachment, double OUTPUT, double OUTPUT, int nth=0, int no_arcs=1, PyLineShape line=None) -> bool """ return _ogl.PyShape_GetAttachmentPositionEdge(*args, **kwargs) def CalcSimpleAttachment(*args, **kwargs): """ - CalcSimpleAttachment(RealPoint pt1, RealPoint pt2, int nth, int noArcs, + CalcSimpleAttachment(self, RealPoint pt1, RealPoint pt2, int nth, int noArcs, PyLineShape line) -> RealPoint """ return _ogl.PyShape_CalcSimpleAttachment(*args, **kwargs) def AttachmentSortTest(*args, **kwargs): - """AttachmentSortTest(int attachmentPoint, RealPoint pt1, RealPoint pt2) -> bool""" + """AttachmentSortTest(self, int attachmentPoint, RealPoint pt1, RealPoint pt2) -> bool""" return _ogl.PyShape_AttachmentSortTest(*args, **kwargs) def EraseLinks(*args, **kwargs): - """EraseLinks(DC dc, int attachment=-1, bool recurse=False)""" + """EraseLinks(self, DC dc, int attachment=-1, bool recurse=False)""" return _ogl.PyShape_EraseLinks(*args, **kwargs) def DrawLinks(*args, **kwargs): - """DrawLinks(DC dc, int attachment=-1, bool recurse=False)""" + """DrawLinks(self, DC dc, int attachment=-1, bool recurse=False)""" return _ogl.PyShape_DrawLinks(*args, **kwargs) def MoveLineToNewAttachment(*args, **kwargs): - """MoveLineToNewAttachment(DC dc, PyLineShape to_move, double x, double y) -> bool""" + """MoveLineToNewAttachment(self, DC dc, PyLineShape to_move, double x, double y) -> bool""" return _ogl.PyShape_MoveLineToNewAttachment(*args, **kwargs) def ApplyAttachmentOrdering(*args, **kwargs): - """ApplyAttachmentOrdering(PyObject linesToSort)""" + """ApplyAttachmentOrdering(self, PyObject linesToSort)""" return _ogl.PyShape_ApplyAttachmentOrdering(*args, **kwargs) def GetBranchingAttachmentRoot(*args, **kwargs): - """GetBranchingAttachmentRoot(int attachment) -> RealPoint""" + """GetBranchingAttachmentRoot(self, int attachment) -> RealPoint""" return _ogl.PyShape_GetBranchingAttachmentRoot(*args, **kwargs) def GetBranchingAttachmentInfo(*args, **kwargs): """ - GetBranchingAttachmentInfo(int attachment, RealPoint root, RealPoint neck, RealPoint shoulder1, + GetBranchingAttachmentInfo(self, int attachment, RealPoint root, RealPoint neck, RealPoint shoulder1, RealPoint shoulder2) -> bool """ return _ogl.PyShape_GetBranchingAttachmentInfo(*args, **kwargs) def GetBranchingAttachmentPoint(*args, **kwargs): - """GetBranchingAttachmentPoint(int attachment, int n, RealPoint attachmentPoint, RealPoint stemPoint) -> bool""" + """GetBranchingAttachmentPoint(self, int attachment, int n, RealPoint attachmentPoint, RealPoint stemPoint) -> bool""" return _ogl.PyShape_GetBranchingAttachmentPoint(*args, **kwargs) def GetAttachmentLineCount(*args, **kwargs): - """GetAttachmentLineCount(int attachment) -> int""" + """GetAttachmentLineCount(self, int attachment) -> int""" return _ogl.PyShape_GetAttachmentLineCount(*args, **kwargs) def SetBranchNeckLength(*args, **kwargs): - """SetBranchNeckLength(int len)""" + """SetBranchNeckLength(self, int len)""" return _ogl.PyShape_SetBranchNeckLength(*args, **kwargs) def GetBranchNeckLength(*args, **kwargs): - """GetBranchNeckLength() -> int""" + """GetBranchNeckLength(self) -> int""" return _ogl.PyShape_GetBranchNeckLength(*args, **kwargs) def SetBranchStemLength(*args, **kwargs): - """SetBranchStemLength(int len)""" + """SetBranchStemLength(self, int len)""" return _ogl.PyShape_SetBranchStemLength(*args, **kwargs) def GetBranchStemLength(*args, **kwargs): - """GetBranchStemLength() -> int""" + """GetBranchStemLength(self) -> int""" return _ogl.PyShape_GetBranchStemLength(*args, **kwargs) def SetBranchSpacing(*args, **kwargs): - """SetBranchSpacing(int len)""" + """SetBranchSpacing(self, int len)""" return _ogl.PyShape_SetBranchSpacing(*args, **kwargs) def GetBranchSpacing(*args, **kwargs): - """GetBranchSpacing() -> int""" + """GetBranchSpacing(self) -> int""" return _ogl.PyShape_GetBranchSpacing(*args, **kwargs) def SetBranchStyle(*args, **kwargs): - """SetBranchStyle(long style)""" + """SetBranchStyle(self, long style)""" return _ogl.PyShape_SetBranchStyle(*args, **kwargs) def GetBranchStyle(*args, **kwargs): - """GetBranchStyle() -> long""" + """GetBranchStyle(self) -> long""" return _ogl.PyShape_GetBranchStyle(*args, **kwargs) def PhysicalToLogicalAttachment(*args, **kwargs): - """PhysicalToLogicalAttachment(int physicalAttachment) -> int""" + """PhysicalToLogicalAttachment(self, int physicalAttachment) -> int""" return _ogl.PyShape_PhysicalToLogicalAttachment(*args, **kwargs) def LogicalToPhysicalAttachment(*args, **kwargs): - """LogicalToPhysicalAttachment(int logicalAttachment) -> int""" + """LogicalToPhysicalAttachment(self, int logicalAttachment) -> int""" return _ogl.PyShape_LogicalToPhysicalAttachment(*args, **kwargs) def Draggable(*args, **kwargs): - """Draggable() -> bool""" + """Draggable(self) -> bool""" return _ogl.PyShape_Draggable(*args, **kwargs) def HasDescendant(*args, **kwargs): - """HasDescendant(PyShape image) -> bool""" + """HasDescendant(self, PyShape image) -> bool""" return _ogl.PyShape_HasDescendant(*args, **kwargs) def CreateNewCopy(*args, **kwargs): - """CreateNewCopy(bool resetMapping=True, bool recompute=True) -> PyShape""" + """CreateNewCopy(self, bool resetMapping=True, bool recompute=True) -> PyShape""" return _ogl.PyShape_CreateNewCopy(*args, **kwargs) def Copy(*args, **kwargs): - """Copy(PyShape copy)""" + """Copy(self, PyShape copy)""" return _ogl.PyShape_Copy(*args, **kwargs) def CopyWithHandler(*args, **kwargs): - """CopyWithHandler(PyShape copy)""" + """CopyWithHandler(self, PyShape copy)""" return _ogl.PyShape_CopyWithHandler(*args, **kwargs) def Rotate(*args, **kwargs): - """Rotate(double x, double y, double theta)""" + """Rotate(self, double x, double y, double theta)""" return _ogl.PyShape_Rotate(*args, **kwargs) def GetRotation(*args, **kwargs): - """GetRotation() -> double""" + """GetRotation(self) -> double""" return _ogl.PyShape_GetRotation(*args, **kwargs) + def SetRotation(*args, **kwargs): + """SetRotation(self, double rotation)""" + return _ogl.PyShape_SetRotation(*args, **kwargs) + def ClearAttachments(*args, **kwargs): - """ClearAttachments()""" + """ClearAttachments(self)""" return _ogl.PyShape_ClearAttachments(*args, **kwargs) def Recentre(*args, **kwargs): - """Recentre(DC dc)""" + """Recentre(self, DC dc)""" return _ogl.PyShape_Recentre(*args, **kwargs) def ClearPointList(*args, **kwargs): - """ClearPointList(wxList list)""" + """ClearPointList(self, wxList list)""" return _ogl.PyShape_ClearPointList(*args, **kwargs) def GetBackgroundPen(*args, **kwargs): - """GetBackgroundPen() -> wxPen""" + """GetBackgroundPen(self) -> wxPen""" return _ogl.PyShape_GetBackgroundPen(*args, **kwargs) def GetBackgroundBrush(*args, **kwargs): - """GetBackgroundBrush() -> wxBrush""" + """GetBackgroundBrush(self) -> wxBrush""" return _ogl.PyShape_GetBackgroundBrush(*args, **kwargs) def base_OnDelete(*args, **kwargs): - """base_OnDelete()""" + """base_OnDelete(self)""" return _ogl.PyShape_base_OnDelete(*args, **kwargs) def base_OnDraw(*args, **kwargs): - """base_OnDraw(DC dc)""" + """base_OnDraw(self, DC dc)""" return _ogl.PyShape_base_OnDraw(*args, **kwargs) def base_OnDrawContents(*args, **kwargs): - """base_OnDrawContents(DC dc)""" + """base_OnDrawContents(self, DC dc)""" return _ogl.PyShape_base_OnDrawContents(*args, **kwargs) def base_OnDrawBranches(*args, **kwargs): - """base_OnDrawBranches(DC dc, bool erase=False)""" + """base_OnDrawBranches(self, DC dc, bool erase=False)""" return _ogl.PyShape_base_OnDrawBranches(*args, **kwargs) def base_OnMoveLinks(*args, **kwargs): - """base_OnMoveLinks(DC dc)""" + """base_OnMoveLinks(self, DC dc)""" return _ogl.PyShape_base_OnMoveLinks(*args, **kwargs) def base_OnErase(*args, **kwargs): - """base_OnErase(DC dc)""" + """base_OnErase(self, DC dc)""" return _ogl.PyShape_base_OnErase(*args, **kwargs) def base_OnEraseContents(*args, **kwargs): - """base_OnEraseContents(DC dc)""" + """base_OnEraseContents(self, DC dc)""" return _ogl.PyShape_base_OnEraseContents(*args, **kwargs) def base_OnHighlight(*args, **kwargs): - """base_OnHighlight(DC dc)""" + """base_OnHighlight(self, DC dc)""" return _ogl.PyShape_base_OnHighlight(*args, **kwargs) def base_OnLeftClick(*args, **kwargs): - """base_OnLeftClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnLeftClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyShape_base_OnLeftClick(*args, **kwargs) def base_OnLeftDoubleClick(*args, **kwargs): - """base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnLeftDoubleClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyShape_base_OnLeftDoubleClick(*args, **kwargs) def base_OnRightClick(*args, **kwargs): - """base_OnRightClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnRightClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyShape_base_OnRightClick(*args, **kwargs) def base_OnSize(*args, **kwargs): - """base_OnSize(double x, double y)""" + """base_OnSize(self, double x, double y)""" return _ogl.PyShape_base_OnSize(*args, **kwargs) def base_OnMovePre(*args, **kwargs): """ - base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, + base_OnMovePre(self, DC dc, double x, double y, double old_x, double old_y, bool display=True) -> bool """ return _ogl.PyShape_base_OnMovePre(*args, **kwargs) def base_OnMovePost(*args, **kwargs): """ - base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, + base_OnMovePost(self, DC dc, double x, double y, double old_x, double old_y, bool display=True) """ return _ogl.PyShape_base_OnMovePost(*args, **kwargs) def base_OnDragLeft(*args, **kwargs): - """base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)""" + """base_OnDragLeft(self, bool draw, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyShape_base_OnDragLeft(*args, **kwargs) def base_OnBeginDragLeft(*args, **kwargs): - """base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)""" + """base_OnBeginDragLeft(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyShape_base_OnBeginDragLeft(*args, **kwargs) def base_OnEndDragLeft(*args, **kwargs): - """base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)""" + """base_OnEndDragLeft(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyShape_base_OnEndDragLeft(*args, **kwargs) def base_OnDragRight(*args, **kwargs): - """base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)""" + """base_OnDragRight(self, bool draw, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyShape_base_OnDragRight(*args, **kwargs) def base_OnBeginDragRight(*args, **kwargs): - """base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)""" + """base_OnBeginDragRight(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyShape_base_OnBeginDragRight(*args, **kwargs) def base_OnEndDragRight(*args, **kwargs): - """base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)""" + """base_OnEndDragRight(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyShape_base_OnEndDragRight(*args, **kwargs) def base_OnDrawOutline(*args, **kwargs): - """base_OnDrawOutline(DC dc, double x, double y, double w, double h)""" + """base_OnDrawOutline(self, DC dc, double x, double y, double w, double h)""" return _ogl.PyShape_base_OnDrawOutline(*args, **kwargs) def base_OnDrawControlPoints(*args, **kwargs): - """base_OnDrawControlPoints(DC dc)""" + """base_OnDrawControlPoints(self, DC dc)""" return _ogl.PyShape_base_OnDrawControlPoints(*args, **kwargs) def base_OnEraseControlPoints(*args, **kwargs): - """base_OnEraseControlPoints(DC dc)""" + """base_OnEraseControlPoints(self, DC dc)""" return _ogl.PyShape_base_OnEraseControlPoints(*args, **kwargs) def base_OnMoveLink(*args, **kwargs): - """base_OnMoveLink(DC dc, bool moveControlPoints=True)""" + """base_OnMoveLink(self, DC dc, bool moveControlPoints=True)""" return _ogl.PyShape_base_OnMoveLink(*args, **kwargs) def base_OnSizingDragLeft(*args, **kwargs): """ - base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, + base_OnSizingDragLeft(self, PyControlPoint pt, bool draw, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyShape_base_OnSizingDragLeft(*args, **kwargs) def base_OnSizingBeginDragLeft(*args, **kwargs): """ - base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, + base_OnSizingBeginDragLeft(self, PyControlPoint pt, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyShape_base_OnSizingBeginDragLeft(*args, **kwargs) def base_OnSizingEndDragLeft(*args, **kwargs): """ - base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, + base_OnSizingEndDragLeft(self, PyControlPoint pt, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyShape_base_OnSizingEndDragLeft(*args, **kwargs) def base_OnBeginSize(*args, **kwargs): - """base_OnBeginSize(double w, double h)""" + """base_OnBeginSize(self, double w, double h)""" return _ogl.PyShape_base_OnBeginSize(*args, **kwargs) def base_OnEndSize(*args, **kwargs): - """base_OnEndSize(double w, double h)""" + """base_OnEndSize(self, double w, double h)""" return _ogl.PyShape_base_OnEndSize(*args, **kwargs) @@ -1037,175 +1066,175 @@ _ogl.PyShape_swigregister(PyShapePtr) oglMETAFLAGS_OUTLINE = _ogl.oglMETAFLAGS_OUTLINE oglMETAFLAGS_ATTACHMENTS = _ogl.oglMETAFLAGS_ATTACHMENTS -class PseudoMetaFile(core.Object): +class PseudoMetaFile(_core.Object): def __repr__(self): return "<%s.%s; proxy of C++ wxPseudoMetaFile instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): - """__init__() -> PseudoMetaFile""" + """__init__(self) -> PseudoMetaFile""" newobj = _ogl.new_PseudoMetaFile(*args, **kwargs) self.this = newobj.this self.thisown = 1 del newobj.thisown def __del__(self, destroy=_ogl.delete_PseudoMetaFile): - """__del__()""" + """__del__(self)""" try: if self.thisown: destroy(self) except: pass def Draw(*args, **kwargs): - """Draw(DC dc, double xoffset, double yoffset)""" + """Draw(self, DC dc, double xoffset, double yoffset)""" return _ogl.PseudoMetaFile_Draw(*args, **kwargs) def Clear(*args, **kwargs): - """Clear()""" + """Clear(self)""" return _ogl.PseudoMetaFile_Clear(*args, **kwargs) def Copy(*args, **kwargs): - """Copy(PseudoMetaFile copy)""" + """Copy(self, PseudoMetaFile copy)""" return _ogl.PseudoMetaFile_Copy(*args, **kwargs) def Scale(*args, **kwargs): - """Scale(double sx, double sy)""" + """Scale(self, double sx, double sy)""" return _ogl.PseudoMetaFile_Scale(*args, **kwargs) def ScaleTo(*args, **kwargs): - """ScaleTo(double w, double h)""" + """ScaleTo(self, double w, double h)""" return _ogl.PseudoMetaFile_ScaleTo(*args, **kwargs) def Translate(*args, **kwargs): - """Translate(double x, double y)""" + """Translate(self, double x, double y)""" return _ogl.PseudoMetaFile_Translate(*args, **kwargs) def Rotate(*args, **kwargs): - """Rotate(double x, double y, double theta)""" + """Rotate(self, double x, double y, double theta)""" return _ogl.PseudoMetaFile_Rotate(*args, **kwargs) def LoadFromMetaFile(*args, **kwargs): - """LoadFromMetaFile(String filename, double width, double height) -> bool""" + """LoadFromMetaFile(self, String filename, double width, double height) -> bool""" return _ogl.PseudoMetaFile_LoadFromMetaFile(*args, **kwargs) def GetBounds(*args, **kwargs): - """GetBounds(double minX, double minY, double maxX, double maxY)""" + """GetBounds(self, double minX, double minY, double maxX, double maxY)""" return _ogl.PseudoMetaFile_GetBounds(*args, **kwargs) def CalculateSize(*args, **kwargs): - """CalculateSize(PyDrawnShape shape)""" + """CalculateSize(self, PyDrawnShape shape)""" return _ogl.PseudoMetaFile_CalculateSize(*args, **kwargs) def SetRotateable(*args, **kwargs): - """SetRotateable(bool rot)""" + """SetRotateable(self, bool rot)""" return _ogl.PseudoMetaFile_SetRotateable(*args, **kwargs) def GetRotateable(*args, **kwargs): - """GetRotateable() -> bool""" + """GetRotateable(self) -> bool""" return _ogl.PseudoMetaFile_GetRotateable(*args, **kwargs) def SetSize(*args, **kwargs): - """SetSize(double w, double h)""" + """SetSize(self, double w, double h)""" return _ogl.PseudoMetaFile_SetSize(*args, **kwargs) def SetFillBrush(*args, **kwargs): - """SetFillBrush(wxBrush brush)""" + """SetFillBrush(self, wxBrush brush)""" return _ogl.PseudoMetaFile_SetFillBrush(*args, **kwargs) def GetFillBrush(*args, **kwargs): - """GetFillBrush() -> wxBrush""" + """GetFillBrush(self) -> wxBrush""" return _ogl.PseudoMetaFile_GetFillBrush(*args, **kwargs) def SetOutlinePen(*args, **kwargs): - """SetOutlinePen(wxPen pen)""" + """SetOutlinePen(self, wxPen pen)""" return _ogl.PseudoMetaFile_SetOutlinePen(*args, **kwargs) def GetOutlinePen(*args, **kwargs): - """GetOutlinePen() -> wxPen""" + """GetOutlinePen(self) -> wxPen""" return _ogl.PseudoMetaFile_GetOutlinePen(*args, **kwargs) def SetOutlineOp(*args, **kwargs): - """SetOutlineOp(int op)""" + """SetOutlineOp(self, int op)""" return _ogl.PseudoMetaFile_SetOutlineOp(*args, **kwargs) def GetOutlineOp(*args, **kwargs): - """GetOutlineOp() -> int""" + """GetOutlineOp(self) -> int""" return _ogl.PseudoMetaFile_GetOutlineOp(*args, **kwargs) def IsValid(*args, **kwargs): - """IsValid() -> bool""" + """IsValid(self) -> bool""" return _ogl.PseudoMetaFile_IsValid(*args, **kwargs) def DrawLine(*args, **kwargs): - """DrawLine(Point pt1, Point pt2)""" + """DrawLine(self, Point pt1, Point pt2)""" return _ogl.PseudoMetaFile_DrawLine(*args, **kwargs) def DrawRectangle(*args, **kwargs): - """DrawRectangle(Rect rect)""" + """DrawRectangle(self, Rect rect)""" return _ogl.PseudoMetaFile_DrawRectangle(*args, **kwargs) def DrawRoundedRectangle(*args, **kwargs): - """DrawRoundedRectangle(Rect rect, double radius)""" + """DrawRoundedRectangle(self, Rect rect, double radius)""" return _ogl.PseudoMetaFile_DrawRoundedRectangle(*args, **kwargs) def DrawArc(*args, **kwargs): - """DrawArc(Point centrePt, Point startPt, Point endPt)""" + """DrawArc(self, Point centrePt, Point startPt, Point endPt)""" return _ogl.PseudoMetaFile_DrawArc(*args, **kwargs) def DrawEllipticArc(*args, **kwargs): - """DrawEllipticArc(Rect rect, double startAngle, double endAngle)""" + """DrawEllipticArc(self, Rect rect, double startAngle, double endAngle)""" return _ogl.PseudoMetaFile_DrawEllipticArc(*args, **kwargs) def DrawEllipse(*args, **kwargs): - """DrawEllipse(Rect rect)""" + """DrawEllipse(self, Rect rect)""" return _ogl.PseudoMetaFile_DrawEllipse(*args, **kwargs) def DrawPoint(*args, **kwargs): - """DrawPoint(Point pt)""" + """DrawPoint(self, Point pt)""" return _ogl.PseudoMetaFile_DrawPoint(*args, **kwargs) def DrawText(*args, **kwargs): - """DrawText(String text, Point pt)""" + """DrawText(self, String text, Point pt)""" return _ogl.PseudoMetaFile_DrawText(*args, **kwargs) def DrawLines(*args, **kwargs): - """DrawLines(int PCOUNT, Point points)""" + """DrawLines(self, int PCOUNT, Point points)""" return _ogl.PseudoMetaFile_DrawLines(*args, **kwargs) def DrawPolygon(*args, **kwargs): - """DrawPolygon(int PCOUNT, Point points, int flags=0)""" + """DrawPolygon(self, int PCOUNT, Point points, int flags=0)""" return _ogl.PseudoMetaFile_DrawPolygon(*args, **kwargs) def DrawSpline(*args, **kwargs): - """DrawSpline(int PCOUNT, Point points)""" + """DrawSpline(self, int PCOUNT, Point points)""" return _ogl.PseudoMetaFile_DrawSpline(*args, **kwargs) def SetClippingRect(*args, **kwargs): - """SetClippingRect(Rect rect)""" + """SetClippingRect(self, Rect rect)""" return _ogl.PseudoMetaFile_SetClippingRect(*args, **kwargs) def DestroyClippingRect(*args, **kwargs): - """DestroyClippingRect()""" + """DestroyClippingRect(self)""" return _ogl.PseudoMetaFile_DestroyClippingRect(*args, **kwargs) def SetPen(*args, **kwargs): - """SetPen(wxPen pen, bool isOutline=FALSE)""" + """SetPen(self, wxPen pen, bool isOutline=FALSE)""" return _ogl.PseudoMetaFile_SetPen(*args, **kwargs) def SetBrush(*args, **kwargs): - """SetBrush(wxBrush brush, bool isFill=FALSE)""" + """SetBrush(self, wxBrush brush, bool isFill=FALSE)""" return _ogl.PseudoMetaFile_SetBrush(*args, **kwargs) def SetFont(*args, **kwargs): - """SetFont(Font font)""" + """SetFont(self, Font font)""" return _ogl.PseudoMetaFile_SetFont(*args, **kwargs) def SetTextColour(*args, **kwargs): - """SetTextColour(Colour colour)""" + """SetTextColour(self, Colour colour)""" return _ogl.PseudoMetaFile_SetTextColour(*args, **kwargs) def SetBackgroundColour(*args, **kwargs): - """SetBackgroundColour(Colour colour)""" + """SetBackgroundColour(self, Colour colour)""" return _ogl.PseudoMetaFile_SetBackgroundColour(*args, **kwargs) def SetBackgroundMode(*args, **kwargs): - """SetBackgroundMode(int mode)""" + """SetBackgroundMode(self, int mode)""" return _ogl.PseudoMetaFile_SetBackgroundMode(*args, **kwargs) @@ -1220,7 +1249,7 @@ class PyRectangleShape(PyShape): def __repr__(self): return "<%s.%s; proxy of C++ wxPyRectangleShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): - """__init__(double width=0.0, double height=0.0) -> PyRectangleShape""" + """__init__(self, double width=0.0, double height=0.0) -> PyRectangleShape""" newobj = _ogl.new_PyRectangleShape(*args, **kwargs) self.this = newobj.this self.thisown = 1 @@ -1228,142 +1257,146 @@ class PyRectangleShape(PyShape): self._setOORandCallbackInfo(PyRectangleShape) def _setCallbackInfo(*args, **kwargs): - """_setCallbackInfo(PyObject self, PyObject _class)""" + """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _ogl.PyRectangleShape__setCallbackInfo(*args, **kwargs) def SetCornerRadius(*args, **kwargs): - """SetCornerRadius(double radius)""" + """SetCornerRadius(self, double radius)""" return _ogl.PyRectangleShape_SetCornerRadius(*args, **kwargs) + def GetCornerRadius(*args, **kwargs): + """GetCornerRadius(self) -> double""" + return _ogl.PyRectangleShape_GetCornerRadius(*args, **kwargs) + def base_OnDelete(*args, **kwargs): - """base_OnDelete()""" + """base_OnDelete(self)""" return _ogl.PyRectangleShape_base_OnDelete(*args, **kwargs) def base_OnDraw(*args, **kwargs): - """base_OnDraw(DC dc)""" + """base_OnDraw(self, DC dc)""" return _ogl.PyRectangleShape_base_OnDraw(*args, **kwargs) def base_OnDrawContents(*args, **kwargs): - """base_OnDrawContents(DC dc)""" + """base_OnDrawContents(self, DC dc)""" return _ogl.PyRectangleShape_base_OnDrawContents(*args, **kwargs) def base_OnDrawBranches(*args, **kwargs): - """base_OnDrawBranches(DC dc, bool erase=FALSE)""" + """base_OnDrawBranches(self, DC dc, bool erase=FALSE)""" return _ogl.PyRectangleShape_base_OnDrawBranches(*args, **kwargs) def base_OnMoveLinks(*args, **kwargs): - """base_OnMoveLinks(DC dc)""" + """base_OnMoveLinks(self, DC dc)""" return _ogl.PyRectangleShape_base_OnMoveLinks(*args, **kwargs) def base_OnErase(*args, **kwargs): - """base_OnErase(DC dc)""" + """base_OnErase(self, DC dc)""" return _ogl.PyRectangleShape_base_OnErase(*args, **kwargs) def base_OnEraseContents(*args, **kwargs): - """base_OnEraseContents(DC dc)""" + """base_OnEraseContents(self, DC dc)""" return _ogl.PyRectangleShape_base_OnEraseContents(*args, **kwargs) def base_OnHighlight(*args, **kwargs): - """base_OnHighlight(DC dc)""" + """base_OnHighlight(self, DC dc)""" return _ogl.PyRectangleShape_base_OnHighlight(*args, **kwargs) def base_OnLeftClick(*args, **kwargs): - """base_OnLeftClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnLeftClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyRectangleShape_base_OnLeftClick(*args, **kwargs) def base_OnLeftDoubleClick(*args, **kwargs): - """base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnLeftDoubleClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyRectangleShape_base_OnLeftDoubleClick(*args, **kwargs) def base_OnRightClick(*args, **kwargs): - """base_OnRightClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnRightClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyRectangleShape_base_OnRightClick(*args, **kwargs) def base_OnSize(*args, **kwargs): - """base_OnSize(double x, double y)""" + """base_OnSize(self, double x, double y)""" return _ogl.PyRectangleShape_base_OnSize(*args, **kwargs) def base_OnMovePre(*args, **kwargs): """ - base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, + base_OnMovePre(self, DC dc, double x, double y, double old_x, double old_y, bool display=True) -> bool """ return _ogl.PyRectangleShape_base_OnMovePre(*args, **kwargs) def base_OnMovePost(*args, **kwargs): """ - base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, + base_OnMovePost(self, DC dc, double x, double y, double old_x, double old_y, bool display=True) """ return _ogl.PyRectangleShape_base_OnMovePost(*args, **kwargs) def base_OnDragLeft(*args, **kwargs): - """base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)""" + """base_OnDragLeft(self, bool draw, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyRectangleShape_base_OnDragLeft(*args, **kwargs) def base_OnBeginDragLeft(*args, **kwargs): - """base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)""" + """base_OnBeginDragLeft(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyRectangleShape_base_OnBeginDragLeft(*args, **kwargs) def base_OnEndDragLeft(*args, **kwargs): - """base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)""" + """base_OnEndDragLeft(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyRectangleShape_base_OnEndDragLeft(*args, **kwargs) def base_OnDragRight(*args, **kwargs): - """base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)""" + """base_OnDragRight(self, bool draw, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyRectangleShape_base_OnDragRight(*args, **kwargs) def base_OnBeginDragRight(*args, **kwargs): - """base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)""" + """base_OnBeginDragRight(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyRectangleShape_base_OnBeginDragRight(*args, **kwargs) def base_OnEndDragRight(*args, **kwargs): - """base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)""" + """base_OnEndDragRight(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyRectangleShape_base_OnEndDragRight(*args, **kwargs) def base_OnDrawOutline(*args, **kwargs): - """base_OnDrawOutline(DC dc, double x, double y, double w, double h)""" + """base_OnDrawOutline(self, DC dc, double x, double y, double w, double h)""" return _ogl.PyRectangleShape_base_OnDrawOutline(*args, **kwargs) def base_OnDrawControlPoints(*args, **kwargs): - """base_OnDrawControlPoints(DC dc)""" + """base_OnDrawControlPoints(self, DC dc)""" return _ogl.PyRectangleShape_base_OnDrawControlPoints(*args, **kwargs) def base_OnEraseControlPoints(*args, **kwargs): - """base_OnEraseControlPoints(DC dc)""" + """base_OnEraseControlPoints(self, DC dc)""" return _ogl.PyRectangleShape_base_OnEraseControlPoints(*args, **kwargs) def base_OnMoveLink(*args, **kwargs): - """base_OnMoveLink(DC dc, bool moveControlPoints=True)""" + """base_OnMoveLink(self, DC dc, bool moveControlPoints=True)""" return _ogl.PyRectangleShape_base_OnMoveLink(*args, **kwargs) def base_OnSizingDragLeft(*args, **kwargs): """ - base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, + base_OnSizingDragLeft(self, PyControlPoint pt, bool draw, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyRectangleShape_base_OnSizingDragLeft(*args, **kwargs) def base_OnSizingBeginDragLeft(*args, **kwargs): """ - base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, + base_OnSizingBeginDragLeft(self, PyControlPoint pt, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyRectangleShape_base_OnSizingBeginDragLeft(*args, **kwargs) def base_OnSizingEndDragLeft(*args, **kwargs): """ - base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, + base_OnSizingEndDragLeft(self, PyControlPoint pt, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyRectangleShape_base_OnSizingEndDragLeft(*args, **kwargs) def base_OnBeginSize(*args, **kwargs): - """base_OnBeginSize(double w, double h)""" + """base_OnBeginSize(self, double w, double h)""" return _ogl.PyRectangleShape_base_OnBeginSize(*args, **kwargs) def base_OnEndSize(*args, **kwargs): - """base_OnEndSize(double w, double h)""" + """base_OnEndSize(self, double w, double h)""" return _ogl.PyRectangleShape_base_OnEndSize(*args, **kwargs) @@ -1379,7 +1412,7 @@ class PyControlPoint(PyRectangleShape): return "<%s.%s; proxy of C++ wxPyControlPoint instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): """ - __init__(PyShapeCanvas the_canvas=None, PyShape object=None, + __init__(self, PyShapeCanvas the_canvas=None, PyShape object=None, double size=0.0, double the_xoffset=0.0, double the_yoffset=0.0, int the_type=0) -> PyControlPoint """ @@ -1390,142 +1423,142 @@ class PyControlPoint(PyRectangleShape): self._setOORandCallbackInfo(PyControlPoint) def _setCallbackInfo(*args, **kwargs): - """_setCallbackInfo(PyObject self, PyObject _class)""" + """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _ogl.PyControlPoint__setCallbackInfo(*args, **kwargs) def SetCornerRadius(*args, **kwargs): - """SetCornerRadius(double radius)""" + """SetCornerRadius(self, double radius)""" return _ogl.PyControlPoint_SetCornerRadius(*args, **kwargs) def base_OnDelete(*args, **kwargs): - """base_OnDelete()""" + """base_OnDelete(self)""" return _ogl.PyControlPoint_base_OnDelete(*args, **kwargs) def base_OnDraw(*args, **kwargs): - """base_OnDraw(DC dc)""" + """base_OnDraw(self, DC dc)""" return _ogl.PyControlPoint_base_OnDraw(*args, **kwargs) def base_OnDrawContents(*args, **kwargs): - """base_OnDrawContents(DC dc)""" + """base_OnDrawContents(self, DC dc)""" return _ogl.PyControlPoint_base_OnDrawContents(*args, **kwargs) def base_OnDrawBranches(*args, **kwargs): - """base_OnDrawBranches(DC dc, bool erase=FALSE)""" + """base_OnDrawBranches(self, DC dc, bool erase=FALSE)""" return _ogl.PyControlPoint_base_OnDrawBranches(*args, **kwargs) def base_OnMoveLinks(*args, **kwargs): - """base_OnMoveLinks(DC dc)""" + """base_OnMoveLinks(self, DC dc)""" return _ogl.PyControlPoint_base_OnMoveLinks(*args, **kwargs) def base_OnErase(*args, **kwargs): - """base_OnErase(DC dc)""" + """base_OnErase(self, DC dc)""" return _ogl.PyControlPoint_base_OnErase(*args, **kwargs) def base_OnEraseContents(*args, **kwargs): - """base_OnEraseContents(DC dc)""" + """base_OnEraseContents(self, DC dc)""" return _ogl.PyControlPoint_base_OnEraseContents(*args, **kwargs) def base_OnHighlight(*args, **kwargs): - """base_OnHighlight(DC dc)""" + """base_OnHighlight(self, DC dc)""" return _ogl.PyControlPoint_base_OnHighlight(*args, **kwargs) def base_OnLeftClick(*args, **kwargs): - """base_OnLeftClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnLeftClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyControlPoint_base_OnLeftClick(*args, **kwargs) def base_OnLeftDoubleClick(*args, **kwargs): - """base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnLeftDoubleClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyControlPoint_base_OnLeftDoubleClick(*args, **kwargs) def base_OnRightClick(*args, **kwargs): - """base_OnRightClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnRightClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyControlPoint_base_OnRightClick(*args, **kwargs) def base_OnSize(*args, **kwargs): - """base_OnSize(double x, double y)""" + """base_OnSize(self, double x, double y)""" return _ogl.PyControlPoint_base_OnSize(*args, **kwargs) def base_OnMovePre(*args, **kwargs): """ - base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, + base_OnMovePre(self, DC dc, double x, double y, double old_x, double old_y, bool display=True) -> bool """ return _ogl.PyControlPoint_base_OnMovePre(*args, **kwargs) def base_OnMovePost(*args, **kwargs): """ - base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, + base_OnMovePost(self, DC dc, double x, double y, double old_x, double old_y, bool display=True) """ return _ogl.PyControlPoint_base_OnMovePost(*args, **kwargs) def base_OnDragLeft(*args, **kwargs): - """base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)""" + """base_OnDragLeft(self, bool draw, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyControlPoint_base_OnDragLeft(*args, **kwargs) def base_OnBeginDragLeft(*args, **kwargs): - """base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)""" + """base_OnBeginDragLeft(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyControlPoint_base_OnBeginDragLeft(*args, **kwargs) def base_OnEndDragLeft(*args, **kwargs): - """base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)""" + """base_OnEndDragLeft(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyControlPoint_base_OnEndDragLeft(*args, **kwargs) def base_OnDragRight(*args, **kwargs): - """base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)""" + """base_OnDragRight(self, bool draw, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyControlPoint_base_OnDragRight(*args, **kwargs) def base_OnBeginDragRight(*args, **kwargs): - """base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)""" + """base_OnBeginDragRight(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyControlPoint_base_OnBeginDragRight(*args, **kwargs) def base_OnEndDragRight(*args, **kwargs): - """base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)""" + """base_OnEndDragRight(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyControlPoint_base_OnEndDragRight(*args, **kwargs) def base_OnDrawOutline(*args, **kwargs): - """base_OnDrawOutline(DC dc, double x, double y, double w, double h)""" + """base_OnDrawOutline(self, DC dc, double x, double y, double w, double h)""" return _ogl.PyControlPoint_base_OnDrawOutline(*args, **kwargs) def base_OnDrawControlPoints(*args, **kwargs): - """base_OnDrawControlPoints(DC dc)""" + """base_OnDrawControlPoints(self, DC dc)""" return _ogl.PyControlPoint_base_OnDrawControlPoints(*args, **kwargs) def base_OnEraseControlPoints(*args, **kwargs): - """base_OnEraseControlPoints(DC dc)""" + """base_OnEraseControlPoints(self, DC dc)""" return _ogl.PyControlPoint_base_OnEraseControlPoints(*args, **kwargs) def base_OnMoveLink(*args, **kwargs): - """base_OnMoveLink(DC dc, bool moveControlPoints=True)""" + """base_OnMoveLink(self, DC dc, bool moveControlPoints=True)""" return _ogl.PyControlPoint_base_OnMoveLink(*args, **kwargs) def base_OnSizingDragLeft(*args, **kwargs): """ - base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, + base_OnSizingDragLeft(self, PyControlPoint pt, bool draw, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyControlPoint_base_OnSizingDragLeft(*args, **kwargs) def base_OnSizingBeginDragLeft(*args, **kwargs): """ - base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, + base_OnSizingBeginDragLeft(self, PyControlPoint pt, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyControlPoint_base_OnSizingBeginDragLeft(*args, **kwargs) def base_OnSizingEndDragLeft(*args, **kwargs): """ - base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, + base_OnSizingEndDragLeft(self, PyControlPoint pt, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyControlPoint_base_OnSizingEndDragLeft(*args, **kwargs) def base_OnBeginSize(*args, **kwargs): - """base_OnBeginSize(double w, double h)""" + """base_OnBeginSize(self, double w, double h)""" return _ogl.PyControlPoint_base_OnBeginSize(*args, **kwargs) def base_OnEndSize(*args, **kwargs): - """base_OnEndSize(double w, double h)""" + """base_OnEndSize(self, double w, double h)""" return _ogl.PyControlPoint_base_OnEndSize(*args, **kwargs) @@ -1540,7 +1573,7 @@ class PyBitmapShape(PyRectangleShape): def __repr__(self): return "<%s.%s; proxy of C++ wxPyBitmapShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): - """__init__() -> PyBitmapShape""" + """__init__(self) -> PyBitmapShape""" newobj = _ogl.new_PyBitmapShape(*args, **kwargs) self.this = newobj.this self.thisown = 1 @@ -1548,154 +1581,154 @@ class PyBitmapShape(PyRectangleShape): self._setOORandCallbackInfo(PyBitmapShape) def _setCallbackInfo(*args, **kwargs): - """_setCallbackInfo(PyObject self, PyObject _class)""" + """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _ogl.PyBitmapShape__setCallbackInfo(*args, **kwargs) def GetBitmap(*args, **kwargs): - """GetBitmap() -> Bitmap""" + """GetBitmap(self) -> Bitmap""" return _ogl.PyBitmapShape_GetBitmap(*args, **kwargs) def GetFilename(*args, **kwargs): - """GetFilename() -> String""" + """GetFilename(self) -> String""" return _ogl.PyBitmapShape_GetFilename(*args, **kwargs) def SetBitmap(*args, **kwargs): - """SetBitmap(Bitmap bitmap)""" + """SetBitmap(self, Bitmap bitmap)""" return _ogl.PyBitmapShape_SetBitmap(*args, **kwargs) def SetFilename(*args, **kwargs): - """SetFilename(String filename)""" + """SetFilename(self, String filename)""" return _ogl.PyBitmapShape_SetFilename(*args, **kwargs) def base_OnDelete(*args, **kwargs): - """base_OnDelete()""" + """base_OnDelete(self)""" return _ogl.PyBitmapShape_base_OnDelete(*args, **kwargs) def base_OnDraw(*args, **kwargs): - """base_OnDraw(DC dc)""" + """base_OnDraw(self, DC dc)""" return _ogl.PyBitmapShape_base_OnDraw(*args, **kwargs) def base_OnDrawContents(*args, **kwargs): - """base_OnDrawContents(DC dc)""" + """base_OnDrawContents(self, DC dc)""" return _ogl.PyBitmapShape_base_OnDrawContents(*args, **kwargs) def base_OnDrawBranches(*args, **kwargs): - """base_OnDrawBranches(DC dc, bool erase=FALSE)""" + """base_OnDrawBranches(self, DC dc, bool erase=FALSE)""" return _ogl.PyBitmapShape_base_OnDrawBranches(*args, **kwargs) def base_OnMoveLinks(*args, **kwargs): - """base_OnMoveLinks(DC dc)""" + """base_OnMoveLinks(self, DC dc)""" return _ogl.PyBitmapShape_base_OnMoveLinks(*args, **kwargs) def base_OnErase(*args, **kwargs): - """base_OnErase(DC dc)""" + """base_OnErase(self, DC dc)""" return _ogl.PyBitmapShape_base_OnErase(*args, **kwargs) def base_OnEraseContents(*args, **kwargs): - """base_OnEraseContents(DC dc)""" + """base_OnEraseContents(self, DC dc)""" return _ogl.PyBitmapShape_base_OnEraseContents(*args, **kwargs) def base_OnHighlight(*args, **kwargs): - """base_OnHighlight(DC dc)""" + """base_OnHighlight(self, DC dc)""" return _ogl.PyBitmapShape_base_OnHighlight(*args, **kwargs) def base_OnLeftClick(*args, **kwargs): - """base_OnLeftClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnLeftClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyBitmapShape_base_OnLeftClick(*args, **kwargs) def base_OnLeftDoubleClick(*args, **kwargs): - """base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnLeftDoubleClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyBitmapShape_base_OnLeftDoubleClick(*args, **kwargs) def base_OnRightClick(*args, **kwargs): - """base_OnRightClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnRightClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyBitmapShape_base_OnRightClick(*args, **kwargs) def base_OnSize(*args, **kwargs): - """base_OnSize(double x, double y)""" + """base_OnSize(self, double x, double y)""" return _ogl.PyBitmapShape_base_OnSize(*args, **kwargs) def base_OnMovePre(*args, **kwargs): """ - base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, + base_OnMovePre(self, DC dc, double x, double y, double old_x, double old_y, bool display=True) -> bool """ return _ogl.PyBitmapShape_base_OnMovePre(*args, **kwargs) def base_OnMovePost(*args, **kwargs): """ - base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, + base_OnMovePost(self, DC dc, double x, double y, double old_x, double old_y, bool display=True) """ return _ogl.PyBitmapShape_base_OnMovePost(*args, **kwargs) def base_OnDragLeft(*args, **kwargs): - """base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)""" + """base_OnDragLeft(self, bool draw, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyBitmapShape_base_OnDragLeft(*args, **kwargs) def base_OnBeginDragLeft(*args, **kwargs): - """base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)""" + """base_OnBeginDragLeft(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyBitmapShape_base_OnBeginDragLeft(*args, **kwargs) def base_OnEndDragLeft(*args, **kwargs): - """base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)""" + """base_OnEndDragLeft(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyBitmapShape_base_OnEndDragLeft(*args, **kwargs) def base_OnDragRight(*args, **kwargs): - """base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)""" + """base_OnDragRight(self, bool draw, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyBitmapShape_base_OnDragRight(*args, **kwargs) def base_OnBeginDragRight(*args, **kwargs): - """base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)""" + """base_OnBeginDragRight(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyBitmapShape_base_OnBeginDragRight(*args, **kwargs) def base_OnEndDragRight(*args, **kwargs): - """base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)""" + """base_OnEndDragRight(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyBitmapShape_base_OnEndDragRight(*args, **kwargs) def base_OnDrawOutline(*args, **kwargs): - """base_OnDrawOutline(DC dc, double x, double y, double w, double h)""" + """base_OnDrawOutline(self, DC dc, double x, double y, double w, double h)""" return _ogl.PyBitmapShape_base_OnDrawOutline(*args, **kwargs) def base_OnDrawControlPoints(*args, **kwargs): - """base_OnDrawControlPoints(DC dc)""" + """base_OnDrawControlPoints(self, DC dc)""" return _ogl.PyBitmapShape_base_OnDrawControlPoints(*args, **kwargs) def base_OnEraseControlPoints(*args, **kwargs): - """base_OnEraseControlPoints(DC dc)""" + """base_OnEraseControlPoints(self, DC dc)""" return _ogl.PyBitmapShape_base_OnEraseControlPoints(*args, **kwargs) def base_OnMoveLink(*args, **kwargs): - """base_OnMoveLink(DC dc, bool moveControlPoints=True)""" + """base_OnMoveLink(self, DC dc, bool moveControlPoints=True)""" return _ogl.PyBitmapShape_base_OnMoveLink(*args, **kwargs) def base_OnSizingDragLeft(*args, **kwargs): """ - base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, + base_OnSizingDragLeft(self, PyControlPoint pt, bool draw, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyBitmapShape_base_OnSizingDragLeft(*args, **kwargs) def base_OnSizingBeginDragLeft(*args, **kwargs): """ - base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, + base_OnSizingBeginDragLeft(self, PyControlPoint pt, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyBitmapShape_base_OnSizingBeginDragLeft(*args, **kwargs) def base_OnSizingEndDragLeft(*args, **kwargs): """ - base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, + base_OnSizingEndDragLeft(self, PyControlPoint pt, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyBitmapShape_base_OnSizingEndDragLeft(*args, **kwargs) def base_OnBeginSize(*args, **kwargs): - """base_OnBeginSize(double w, double h)""" + """base_OnBeginSize(self, double w, double h)""" return _ogl.PyBitmapShape_base_OnBeginSize(*args, **kwargs) def base_OnEndSize(*args, **kwargs): - """base_OnEndSize(double w, double h)""" + """base_OnEndSize(self, double w, double h)""" return _ogl.PyBitmapShape_base_OnEndSize(*args, **kwargs) @@ -1710,7 +1743,7 @@ class PyDrawnShape(PyRectangleShape): def __repr__(self): return "<%s.%s; proxy of C++ wxPyDrawnShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): - """__init__() -> PyDrawnShape""" + """__init__(self) -> PyDrawnShape""" newobj = _ogl.new_PyDrawnShape(*args, **kwargs) self.this = newobj.this self.thisown = 1 @@ -1718,250 +1751,250 @@ class PyDrawnShape(PyRectangleShape): self._setOORandCallbackInfo(PyDrawnShape) def _setCallbackInfo(*args, **kwargs): - """_setCallbackInfo(PyObject self, PyObject _class)""" + """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _ogl.PyDrawnShape__setCallbackInfo(*args, **kwargs) def CalculateSize(*args, **kwargs): - """CalculateSize()""" + """CalculateSize(self)""" return _ogl.PyDrawnShape_CalculateSize(*args, **kwargs) def DestroyClippingRect(*args, **kwargs): - """DestroyClippingRect()""" + """DestroyClippingRect(self)""" return _ogl.PyDrawnShape_DestroyClippingRect(*args, **kwargs) def DrawArc(*args, **kwargs): - """DrawArc(Point centrePoint, Point startPoint, Point endPoint)""" + """DrawArc(self, Point centrePoint, Point startPoint, Point endPoint)""" return _ogl.PyDrawnShape_DrawArc(*args, **kwargs) def DrawAtAngle(*args, **kwargs): - """DrawAtAngle(int angle)""" + """DrawAtAngle(self, int angle)""" return _ogl.PyDrawnShape_DrawAtAngle(*args, **kwargs) def DrawEllipticArc(*args, **kwargs): - """DrawEllipticArc(Rect rect, double startAngle, double endAngle)""" + """DrawEllipticArc(self, Rect rect, double startAngle, double endAngle)""" return _ogl.PyDrawnShape_DrawEllipticArc(*args, **kwargs) def DrawLine(*args, **kwargs): - """DrawLine(Point point1, Point point2)""" + """DrawLine(self, Point point1, Point point2)""" return _ogl.PyDrawnShape_DrawLine(*args, **kwargs) def DrawLines(*args, **kwargs): - """DrawLines(int PCOUNT, Point points)""" + """DrawLines(self, int PCOUNT, Point points)""" return _ogl.PyDrawnShape_DrawLines(*args, **kwargs) def DrawPoint(*args, **kwargs): - """DrawPoint(Point point)""" + """DrawPoint(self, Point point)""" return _ogl.PyDrawnShape_DrawPoint(*args, **kwargs) def DrawPolygon(*args, **kwargs): - """DrawPolygon(int PCOUNT, Point points, int flags=0)""" + """DrawPolygon(self, int PCOUNT, Point points, int flags=0)""" return _ogl.PyDrawnShape_DrawPolygon(*args, **kwargs) def DrawRectangle(*args, **kwargs): - """DrawRectangle(Rect rect)""" + """DrawRectangle(self, Rect rect)""" return _ogl.PyDrawnShape_DrawRectangle(*args, **kwargs) def DrawRoundedRectangle(*args, **kwargs): - """DrawRoundedRectangle(Rect rect, double radius)""" + """DrawRoundedRectangle(self, Rect rect, double radius)""" return _ogl.PyDrawnShape_DrawRoundedRectangle(*args, **kwargs) def DrawSpline(*args, **kwargs): - """DrawSpline(int PCOUNT, Point points)""" + """DrawSpline(self, int PCOUNT, Point points)""" return _ogl.PyDrawnShape_DrawSpline(*args, **kwargs) def DrawText(*args, **kwargs): - """DrawText(String text, Point point)""" + """DrawText(self, String text, Point point)""" return _ogl.PyDrawnShape_DrawText(*args, **kwargs) def GetAngle(*args, **kwargs): - """GetAngle() -> int""" + """GetAngle(self) -> int""" return _ogl.PyDrawnShape_GetAngle(*args, **kwargs) def GetMetaFile(*args, **kwargs): - """GetMetaFile() -> PseudoMetaFile""" + """GetMetaFile(self) -> PseudoMetaFile""" return _ogl.PyDrawnShape_GetMetaFile(*args, **kwargs) def GetRotation(*args, **kwargs): - """GetRotation() -> double""" + """GetRotation(self) -> double""" return _ogl.PyDrawnShape_GetRotation(*args, **kwargs) def LoadFromMetaFile(*args, **kwargs): - """LoadFromMetaFile(String filename) -> bool""" + """LoadFromMetaFile(self, String filename) -> bool""" return _ogl.PyDrawnShape_LoadFromMetaFile(*args, **kwargs) def Rotate(*args, **kwargs): - """Rotate(double x, double y, double theta)""" + """Rotate(self, double x, double y, double theta)""" return _ogl.PyDrawnShape_Rotate(*args, **kwargs) def SetClippingRect(*args, **kwargs): - """SetClippingRect(Rect rect)""" + """SetClippingRect(self, Rect rect)""" return _ogl.PyDrawnShape_SetClippingRect(*args, **kwargs) def SetDrawnBackgroundColour(*args, **kwargs): - """SetDrawnBackgroundColour(Colour colour)""" + """SetDrawnBackgroundColour(self, Colour colour)""" return _ogl.PyDrawnShape_SetDrawnBackgroundColour(*args, **kwargs) def SetDrawnBackgroundMode(*args, **kwargs): - """SetDrawnBackgroundMode(int mode)""" + """SetDrawnBackgroundMode(self, int mode)""" return _ogl.PyDrawnShape_SetDrawnBackgroundMode(*args, **kwargs) def SetDrawnBrush(*args, **kwargs): - """SetDrawnBrush(wxBrush pen, bool isOutline=FALSE)""" + """SetDrawnBrush(self, wxBrush pen, bool isOutline=FALSE)""" return _ogl.PyDrawnShape_SetDrawnBrush(*args, **kwargs) def SetDrawnFont(*args, **kwargs): - """SetDrawnFont(Font font)""" + """SetDrawnFont(self, Font font)""" return _ogl.PyDrawnShape_SetDrawnFont(*args, **kwargs) def SetDrawnPen(*args, **kwargs): - """SetDrawnPen(wxPen pen, bool isOutline=FALSE)""" + """SetDrawnPen(self, wxPen pen, bool isOutline=FALSE)""" return _ogl.PyDrawnShape_SetDrawnPen(*args, **kwargs) def SetDrawnTextColour(*args, **kwargs): - """SetDrawnTextColour(Colour colour)""" + """SetDrawnTextColour(self, Colour colour)""" return _ogl.PyDrawnShape_SetDrawnTextColour(*args, **kwargs) def Scale(*args, **kwargs): - """Scale(double sx, double sy)""" + """Scale(self, double sx, double sy)""" return _ogl.PyDrawnShape_Scale(*args, **kwargs) def SetSaveToFile(*args, **kwargs): - """SetSaveToFile(bool save)""" + """SetSaveToFile(self, bool save)""" return _ogl.PyDrawnShape_SetSaveToFile(*args, **kwargs) def Translate(*args, **kwargs): - """Translate(double x, double y)""" + """Translate(self, double x, double y)""" return _ogl.PyDrawnShape_Translate(*args, **kwargs) def base_OnDelete(*args, **kwargs): - """base_OnDelete()""" + """base_OnDelete(self)""" return _ogl.PyDrawnShape_base_OnDelete(*args, **kwargs) def base_OnDraw(*args, **kwargs): - """base_OnDraw(DC dc)""" + """base_OnDraw(self, DC dc)""" return _ogl.PyDrawnShape_base_OnDraw(*args, **kwargs) def base_OnDrawContents(*args, **kwargs): - """base_OnDrawContents(DC dc)""" + """base_OnDrawContents(self, DC dc)""" return _ogl.PyDrawnShape_base_OnDrawContents(*args, **kwargs) def base_OnDrawBranches(*args, **kwargs): - """base_OnDrawBranches(DC dc, bool erase=FALSE)""" + """base_OnDrawBranches(self, DC dc, bool erase=FALSE)""" return _ogl.PyDrawnShape_base_OnDrawBranches(*args, **kwargs) def base_OnMoveLinks(*args, **kwargs): - """base_OnMoveLinks(DC dc)""" + """base_OnMoveLinks(self, DC dc)""" return _ogl.PyDrawnShape_base_OnMoveLinks(*args, **kwargs) def base_OnErase(*args, **kwargs): - """base_OnErase(DC dc)""" + """base_OnErase(self, DC dc)""" return _ogl.PyDrawnShape_base_OnErase(*args, **kwargs) def base_OnEraseContents(*args, **kwargs): - """base_OnEraseContents(DC dc)""" + """base_OnEraseContents(self, DC dc)""" return _ogl.PyDrawnShape_base_OnEraseContents(*args, **kwargs) def base_OnHighlight(*args, **kwargs): - """base_OnHighlight(DC dc)""" + """base_OnHighlight(self, DC dc)""" return _ogl.PyDrawnShape_base_OnHighlight(*args, **kwargs) def base_OnLeftClick(*args, **kwargs): - """base_OnLeftClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnLeftClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyDrawnShape_base_OnLeftClick(*args, **kwargs) def base_OnLeftDoubleClick(*args, **kwargs): - """base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnLeftDoubleClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyDrawnShape_base_OnLeftDoubleClick(*args, **kwargs) def base_OnRightClick(*args, **kwargs): - """base_OnRightClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnRightClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyDrawnShape_base_OnRightClick(*args, **kwargs) def base_OnSize(*args, **kwargs): - """base_OnSize(double x, double y)""" + """base_OnSize(self, double x, double y)""" return _ogl.PyDrawnShape_base_OnSize(*args, **kwargs) def base_OnMovePre(*args, **kwargs): """ - base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, + base_OnMovePre(self, DC dc, double x, double y, double old_x, double old_y, bool display=True) -> bool """ return _ogl.PyDrawnShape_base_OnMovePre(*args, **kwargs) def base_OnMovePost(*args, **kwargs): """ - base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, + base_OnMovePost(self, DC dc, double x, double y, double old_x, double old_y, bool display=True) """ return _ogl.PyDrawnShape_base_OnMovePost(*args, **kwargs) def base_OnDragLeft(*args, **kwargs): - """base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)""" + """base_OnDragLeft(self, bool draw, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyDrawnShape_base_OnDragLeft(*args, **kwargs) def base_OnBeginDragLeft(*args, **kwargs): - """base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)""" + """base_OnBeginDragLeft(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyDrawnShape_base_OnBeginDragLeft(*args, **kwargs) def base_OnEndDragLeft(*args, **kwargs): - """base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)""" + """base_OnEndDragLeft(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyDrawnShape_base_OnEndDragLeft(*args, **kwargs) def base_OnDragRight(*args, **kwargs): - """base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)""" + """base_OnDragRight(self, bool draw, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyDrawnShape_base_OnDragRight(*args, **kwargs) def base_OnBeginDragRight(*args, **kwargs): - """base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)""" + """base_OnBeginDragRight(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyDrawnShape_base_OnBeginDragRight(*args, **kwargs) def base_OnEndDragRight(*args, **kwargs): - """base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)""" + """base_OnEndDragRight(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyDrawnShape_base_OnEndDragRight(*args, **kwargs) def base_OnDrawOutline(*args, **kwargs): - """base_OnDrawOutline(DC dc, double x, double y, double w, double h)""" + """base_OnDrawOutline(self, DC dc, double x, double y, double w, double h)""" return _ogl.PyDrawnShape_base_OnDrawOutline(*args, **kwargs) def base_OnDrawControlPoints(*args, **kwargs): - """base_OnDrawControlPoints(DC dc)""" + """base_OnDrawControlPoints(self, DC dc)""" return _ogl.PyDrawnShape_base_OnDrawControlPoints(*args, **kwargs) def base_OnEraseControlPoints(*args, **kwargs): - """base_OnEraseControlPoints(DC dc)""" + """base_OnEraseControlPoints(self, DC dc)""" return _ogl.PyDrawnShape_base_OnEraseControlPoints(*args, **kwargs) def base_OnMoveLink(*args, **kwargs): - """base_OnMoveLink(DC dc, bool moveControlPoints=True)""" + """base_OnMoveLink(self, DC dc, bool moveControlPoints=True)""" return _ogl.PyDrawnShape_base_OnMoveLink(*args, **kwargs) def base_OnSizingDragLeft(*args, **kwargs): """ - base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, + base_OnSizingDragLeft(self, PyControlPoint pt, bool draw, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyDrawnShape_base_OnSizingDragLeft(*args, **kwargs) def base_OnSizingBeginDragLeft(*args, **kwargs): """ - base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, + base_OnSizingBeginDragLeft(self, PyControlPoint pt, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyDrawnShape_base_OnSizingBeginDragLeft(*args, **kwargs) def base_OnSizingEndDragLeft(*args, **kwargs): """ - base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, + base_OnSizingEndDragLeft(self, PyControlPoint pt, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyDrawnShape_base_OnSizingEndDragLeft(*args, **kwargs) def base_OnBeginSize(*args, **kwargs): - """base_OnBeginSize(double w, double h)""" + """base_OnBeginSize(self, double w, double h)""" return _ogl.PyDrawnShape_base_OnBeginSize(*args, **kwargs) def base_OnEndSize(*args, **kwargs): - """base_OnEndSize(double w, double h)""" + """base_OnEndSize(self, double w, double h)""" return _ogl.PyDrawnShape_base_OnEndSize(*args, **kwargs) @@ -1972,25 +2005,25 @@ class PyDrawnShapePtr(PyDrawnShape): self.__class__ = PyDrawnShape _ogl.PyDrawnShape_swigregister(PyDrawnShapePtr) -class OGLConstraint(core.Object): +class OGLConstraint(_core.Object): def __repr__(self): return "<%s.%s; proxy of C++ wxOGLConstraint instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): - """__init__(int type, PyShape constraining, PyObject constrained) -> OGLConstraint""" + """__init__(self, int type, PyShape constraining, PyObject constrained) -> OGLConstraint""" newobj = _ogl.new_OGLConstraint(*args, **kwargs) self.this = newobj.this self.thisown = 1 del newobj.thisown def Evaluate(*args, **kwargs): - """Evaluate() -> bool""" + """Evaluate(self) -> bool""" return _ogl.OGLConstraint_Evaluate(*args, **kwargs) def SetSpacing(*args, **kwargs): - """SetSpacing(double x, double y)""" + """SetSpacing(self, double x, double y)""" return _ogl.OGLConstraint_SetSpacing(*args, **kwargs) def Equals(*args, **kwargs): - """Equals(double a, double b) -> bool""" + """Equals(self, double a, double b) -> bool""" return _ogl.OGLConstraint_Equals(*args, **kwargs) @@ -2005,7 +2038,7 @@ class PyCompositeShape(PyRectangleShape): def __repr__(self): return "<%s.%s; proxy of C++ wxPyCompositeShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): - """__init__() -> PyCompositeShape""" + """__init__(self) -> PyCompositeShape""" newobj = _ogl.new_PyCompositeShape(*args, **kwargs) self.this = newobj.this self.thisown = 1 @@ -2013,194 +2046,194 @@ class PyCompositeShape(PyRectangleShape): self._setOORandCallbackInfo(PyCompositeShape) def _setCallbackInfo(*args, **kwargs): - """_setCallbackInfo(PyObject self, PyObject _class)""" + """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _ogl.PyCompositeShape__setCallbackInfo(*args, **kwargs) def AddChild(*args, **kwargs): - """AddChild(PyShape child, PyShape addAfter=None)""" + """AddChild(self, PyShape child, PyShape addAfter=None)""" return _ogl.PyCompositeShape_AddChild(*args, **kwargs) def AddConstraint(*args, **kwargs): - """AddConstraint(OGLConstraint constraint) -> OGLConstraint""" + """AddConstraint(self, OGLConstraint constraint) -> OGLConstraint""" return _ogl.PyCompositeShape_AddConstraint(*args, **kwargs) def AddConstrainedShapes(*args, **kwargs): - """AddConstrainedShapes(int type, PyShape constraining, PyObject constrained) -> OGLConstraint""" + """AddConstrainedShapes(self, int type, PyShape constraining, PyObject constrained) -> OGLConstraint""" return _ogl.PyCompositeShape_AddConstrainedShapes(*args, **kwargs) def AddSimpleConstraint(*args, **kwargs): - """AddSimpleConstraint(int type, PyShape constraining, PyShape constrained) -> OGLConstraint""" + """AddSimpleConstraint(self, int type, PyShape constraining, PyShape constrained) -> OGLConstraint""" return _ogl.PyCompositeShape_AddSimpleConstraint(*args, **kwargs) def CalculateSize(*args, **kwargs): - """CalculateSize()""" + """CalculateSize(self)""" return _ogl.PyCompositeShape_CalculateSize(*args, **kwargs) def ContainsDivision(*args, **kwargs): - """ContainsDivision(PyDivisionShape division) -> bool""" + """ContainsDivision(self, PyDivisionShape division) -> bool""" return _ogl.PyCompositeShape_ContainsDivision(*args, **kwargs) def DeleteConstraint(*args, **kwargs): - """DeleteConstraint(OGLConstraint constraint)""" + """DeleteConstraint(self, OGLConstraint constraint)""" return _ogl.PyCompositeShape_DeleteConstraint(*args, **kwargs) def DeleteConstraintsInvolvingChild(*args, **kwargs): - """DeleteConstraintsInvolvingChild(PyShape child)""" + """DeleteConstraintsInvolvingChild(self, PyShape child)""" return _ogl.PyCompositeShape_DeleteConstraintsInvolvingChild(*args, **kwargs) def FindContainerImage(*args, **kwargs): - """FindContainerImage() -> PyShape""" + """FindContainerImage(self) -> PyShape""" return _ogl.PyCompositeShape_FindContainerImage(*args, **kwargs) def GetConstraints(*args, **kwargs): - """GetConstraints() -> PyObject""" + """GetConstraints(self) -> PyObject""" return _ogl.PyCompositeShape_GetConstraints(*args, **kwargs) def GetDivisions(*args, **kwargs): - """GetDivisions() -> PyObject""" + """GetDivisions(self) -> PyObject""" return _ogl.PyCompositeShape_GetDivisions(*args, **kwargs) def MakeContainer(*args, **kwargs): - """MakeContainer()""" + """MakeContainer(self)""" return _ogl.PyCompositeShape_MakeContainer(*args, **kwargs) def Recompute(*args, **kwargs): - """Recompute() -> bool""" + """Recompute(self) -> bool""" return _ogl.PyCompositeShape_Recompute(*args, **kwargs) def RemoveChild(*args, **kwargs): - """RemoveChild(PyShape child)""" + """RemoveChild(self, PyShape child)""" return _ogl.PyCompositeShape_RemoveChild(*args, **kwargs) def base_OnDelete(*args, **kwargs): - """base_OnDelete()""" + """base_OnDelete(self)""" return _ogl.PyCompositeShape_base_OnDelete(*args, **kwargs) def base_OnDraw(*args, **kwargs): - """base_OnDraw(DC dc)""" + """base_OnDraw(self, DC dc)""" return _ogl.PyCompositeShape_base_OnDraw(*args, **kwargs) def base_OnDrawContents(*args, **kwargs): - """base_OnDrawContents(DC dc)""" + """base_OnDrawContents(self, DC dc)""" return _ogl.PyCompositeShape_base_OnDrawContents(*args, **kwargs) def base_OnDrawBranches(*args, **kwargs): - """base_OnDrawBranches(DC dc, bool erase=FALSE)""" + """base_OnDrawBranches(self, DC dc, bool erase=FALSE)""" return _ogl.PyCompositeShape_base_OnDrawBranches(*args, **kwargs) def base_OnMoveLinks(*args, **kwargs): - """base_OnMoveLinks(DC dc)""" + """base_OnMoveLinks(self, DC dc)""" return _ogl.PyCompositeShape_base_OnMoveLinks(*args, **kwargs) def base_OnErase(*args, **kwargs): - """base_OnErase(DC dc)""" + """base_OnErase(self, DC dc)""" return _ogl.PyCompositeShape_base_OnErase(*args, **kwargs) def base_OnEraseContents(*args, **kwargs): - """base_OnEraseContents(DC dc)""" + """base_OnEraseContents(self, DC dc)""" return _ogl.PyCompositeShape_base_OnEraseContents(*args, **kwargs) def base_OnHighlight(*args, **kwargs): - """base_OnHighlight(DC dc)""" + """base_OnHighlight(self, DC dc)""" return _ogl.PyCompositeShape_base_OnHighlight(*args, **kwargs) def base_OnLeftClick(*args, **kwargs): - """base_OnLeftClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnLeftClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyCompositeShape_base_OnLeftClick(*args, **kwargs) def base_OnLeftDoubleClick(*args, **kwargs): - """base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnLeftDoubleClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyCompositeShape_base_OnLeftDoubleClick(*args, **kwargs) def base_OnRightClick(*args, **kwargs): - """base_OnRightClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnRightClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyCompositeShape_base_OnRightClick(*args, **kwargs) def base_OnSize(*args, **kwargs): - """base_OnSize(double x, double y)""" + """base_OnSize(self, double x, double y)""" return _ogl.PyCompositeShape_base_OnSize(*args, **kwargs) def base_OnMovePre(*args, **kwargs): """ - base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, + base_OnMovePre(self, DC dc, double x, double y, double old_x, double old_y, bool display=True) -> bool """ return _ogl.PyCompositeShape_base_OnMovePre(*args, **kwargs) def base_OnMovePost(*args, **kwargs): """ - base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, + base_OnMovePost(self, DC dc, double x, double y, double old_x, double old_y, bool display=True) """ return _ogl.PyCompositeShape_base_OnMovePost(*args, **kwargs) def base_OnDragLeft(*args, **kwargs): - """base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)""" + """base_OnDragLeft(self, bool draw, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyCompositeShape_base_OnDragLeft(*args, **kwargs) def base_OnBeginDragLeft(*args, **kwargs): - """base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)""" + """base_OnBeginDragLeft(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyCompositeShape_base_OnBeginDragLeft(*args, **kwargs) def base_OnEndDragLeft(*args, **kwargs): - """base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)""" + """base_OnEndDragLeft(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyCompositeShape_base_OnEndDragLeft(*args, **kwargs) def base_OnDragRight(*args, **kwargs): - """base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)""" + """base_OnDragRight(self, bool draw, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyCompositeShape_base_OnDragRight(*args, **kwargs) def base_OnBeginDragRight(*args, **kwargs): - """base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)""" + """base_OnBeginDragRight(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyCompositeShape_base_OnBeginDragRight(*args, **kwargs) def base_OnEndDragRight(*args, **kwargs): - """base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)""" + """base_OnEndDragRight(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyCompositeShape_base_OnEndDragRight(*args, **kwargs) def base_OnDrawOutline(*args, **kwargs): - """base_OnDrawOutline(DC dc, double x, double y, double w, double h)""" + """base_OnDrawOutline(self, DC dc, double x, double y, double w, double h)""" return _ogl.PyCompositeShape_base_OnDrawOutline(*args, **kwargs) def base_OnDrawControlPoints(*args, **kwargs): - """base_OnDrawControlPoints(DC dc)""" + """base_OnDrawControlPoints(self, DC dc)""" return _ogl.PyCompositeShape_base_OnDrawControlPoints(*args, **kwargs) def base_OnEraseControlPoints(*args, **kwargs): - """base_OnEraseControlPoints(DC dc)""" + """base_OnEraseControlPoints(self, DC dc)""" return _ogl.PyCompositeShape_base_OnEraseControlPoints(*args, **kwargs) def base_OnMoveLink(*args, **kwargs): - """base_OnMoveLink(DC dc, bool moveControlPoints=True)""" + """base_OnMoveLink(self, DC dc, bool moveControlPoints=True)""" return _ogl.PyCompositeShape_base_OnMoveLink(*args, **kwargs) def base_OnSizingDragLeft(*args, **kwargs): """ - base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, + base_OnSizingDragLeft(self, PyControlPoint pt, bool draw, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyCompositeShape_base_OnSizingDragLeft(*args, **kwargs) def base_OnSizingBeginDragLeft(*args, **kwargs): """ - base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, + base_OnSizingBeginDragLeft(self, PyControlPoint pt, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyCompositeShape_base_OnSizingBeginDragLeft(*args, **kwargs) def base_OnSizingEndDragLeft(*args, **kwargs): """ - base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, + base_OnSizingEndDragLeft(self, PyControlPoint pt, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyCompositeShape_base_OnSizingEndDragLeft(*args, **kwargs) def base_OnBeginSize(*args, **kwargs): - """base_OnBeginSize(double w, double h)""" + """base_OnBeginSize(self, double w, double h)""" return _ogl.PyCompositeShape_base_OnBeginSize(*args, **kwargs) def base_OnEndSize(*args, **kwargs): - """base_OnEndSize(double w, double h)""" + """base_OnEndSize(self, double w, double h)""" return _ogl.PyCompositeShape_base_OnEndSize(*args, **kwargs) @@ -2215,7 +2248,7 @@ class PyDividedShape(PyRectangleShape): def __repr__(self): return "<%s.%s; proxy of C++ wxPyDividedShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): - """__init__(double width=0.0, double height=0.0) -> PyDividedShape""" + """__init__(self, double width=0.0, double height=0.0) -> PyDividedShape""" newobj = _ogl.new_PyDividedShape(*args, **kwargs) self.this = newobj.this self.thisown = 1 @@ -2223,146 +2256,146 @@ class PyDividedShape(PyRectangleShape): self._setOORandCallbackInfo(PyDividedShape) def _setCallbackInfo(*args, **kwargs): - """_setCallbackInfo(PyObject self, PyObject _class)""" + """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _ogl.PyDividedShape__setCallbackInfo(*args, **kwargs) def EditRegions(*args, **kwargs): - """EditRegions()""" + """EditRegions(self)""" return _ogl.PyDividedShape_EditRegions(*args, **kwargs) def SetRegionSizes(*args, **kwargs): - """SetRegionSizes()""" + """SetRegionSizes(self)""" return _ogl.PyDividedShape_SetRegionSizes(*args, **kwargs) def base_OnDelete(*args, **kwargs): - """base_OnDelete()""" + """base_OnDelete(self)""" return _ogl.PyDividedShape_base_OnDelete(*args, **kwargs) def base_OnDraw(*args, **kwargs): - """base_OnDraw(DC dc)""" + """base_OnDraw(self, DC dc)""" return _ogl.PyDividedShape_base_OnDraw(*args, **kwargs) def base_OnDrawContents(*args, **kwargs): - """base_OnDrawContents(DC dc)""" + """base_OnDrawContents(self, DC dc)""" return _ogl.PyDividedShape_base_OnDrawContents(*args, **kwargs) def base_OnDrawBranches(*args, **kwargs): - """base_OnDrawBranches(DC dc, bool erase=FALSE)""" + """base_OnDrawBranches(self, DC dc, bool erase=FALSE)""" return _ogl.PyDividedShape_base_OnDrawBranches(*args, **kwargs) def base_OnMoveLinks(*args, **kwargs): - """base_OnMoveLinks(DC dc)""" + """base_OnMoveLinks(self, DC dc)""" return _ogl.PyDividedShape_base_OnMoveLinks(*args, **kwargs) def base_OnErase(*args, **kwargs): - """base_OnErase(DC dc)""" + """base_OnErase(self, DC dc)""" return _ogl.PyDividedShape_base_OnErase(*args, **kwargs) def base_OnEraseContents(*args, **kwargs): - """base_OnEraseContents(DC dc)""" + """base_OnEraseContents(self, DC dc)""" return _ogl.PyDividedShape_base_OnEraseContents(*args, **kwargs) def base_OnHighlight(*args, **kwargs): - """base_OnHighlight(DC dc)""" + """base_OnHighlight(self, DC dc)""" return _ogl.PyDividedShape_base_OnHighlight(*args, **kwargs) def base_OnLeftClick(*args, **kwargs): - """base_OnLeftClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnLeftClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyDividedShape_base_OnLeftClick(*args, **kwargs) def base_OnLeftDoubleClick(*args, **kwargs): - """base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnLeftDoubleClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyDividedShape_base_OnLeftDoubleClick(*args, **kwargs) def base_OnRightClick(*args, **kwargs): - """base_OnRightClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnRightClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyDividedShape_base_OnRightClick(*args, **kwargs) def base_OnSize(*args, **kwargs): - """base_OnSize(double x, double y)""" + """base_OnSize(self, double x, double y)""" return _ogl.PyDividedShape_base_OnSize(*args, **kwargs) def base_OnMovePre(*args, **kwargs): """ - base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, + base_OnMovePre(self, DC dc, double x, double y, double old_x, double old_y, bool display=True) -> bool """ return _ogl.PyDividedShape_base_OnMovePre(*args, **kwargs) def base_OnMovePost(*args, **kwargs): """ - base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, + base_OnMovePost(self, DC dc, double x, double y, double old_x, double old_y, bool display=True) """ return _ogl.PyDividedShape_base_OnMovePost(*args, **kwargs) def base_OnDragLeft(*args, **kwargs): - """base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)""" + """base_OnDragLeft(self, bool draw, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyDividedShape_base_OnDragLeft(*args, **kwargs) def base_OnBeginDragLeft(*args, **kwargs): - """base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)""" + """base_OnBeginDragLeft(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyDividedShape_base_OnBeginDragLeft(*args, **kwargs) def base_OnEndDragLeft(*args, **kwargs): - """base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)""" + """base_OnEndDragLeft(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyDividedShape_base_OnEndDragLeft(*args, **kwargs) def base_OnDragRight(*args, **kwargs): - """base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)""" + """base_OnDragRight(self, bool draw, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyDividedShape_base_OnDragRight(*args, **kwargs) def base_OnBeginDragRight(*args, **kwargs): - """base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)""" + """base_OnBeginDragRight(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyDividedShape_base_OnBeginDragRight(*args, **kwargs) def base_OnEndDragRight(*args, **kwargs): - """base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)""" + """base_OnEndDragRight(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyDividedShape_base_OnEndDragRight(*args, **kwargs) def base_OnDrawOutline(*args, **kwargs): - """base_OnDrawOutline(DC dc, double x, double y, double w, double h)""" + """base_OnDrawOutline(self, DC dc, double x, double y, double w, double h)""" return _ogl.PyDividedShape_base_OnDrawOutline(*args, **kwargs) def base_OnDrawControlPoints(*args, **kwargs): - """base_OnDrawControlPoints(DC dc)""" + """base_OnDrawControlPoints(self, DC dc)""" return _ogl.PyDividedShape_base_OnDrawControlPoints(*args, **kwargs) def base_OnEraseControlPoints(*args, **kwargs): - """base_OnEraseControlPoints(DC dc)""" + """base_OnEraseControlPoints(self, DC dc)""" return _ogl.PyDividedShape_base_OnEraseControlPoints(*args, **kwargs) def base_OnMoveLink(*args, **kwargs): - """base_OnMoveLink(DC dc, bool moveControlPoints=True)""" + """base_OnMoveLink(self, DC dc, bool moveControlPoints=True)""" return _ogl.PyDividedShape_base_OnMoveLink(*args, **kwargs) def base_OnSizingDragLeft(*args, **kwargs): """ - base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, + base_OnSizingDragLeft(self, PyControlPoint pt, bool draw, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyDividedShape_base_OnSizingDragLeft(*args, **kwargs) def base_OnSizingBeginDragLeft(*args, **kwargs): """ - base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, + base_OnSizingBeginDragLeft(self, PyControlPoint pt, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyDividedShape_base_OnSizingBeginDragLeft(*args, **kwargs) def base_OnSizingEndDragLeft(*args, **kwargs): """ - base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, + base_OnSizingEndDragLeft(self, PyControlPoint pt, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyDividedShape_base_OnSizingEndDragLeft(*args, **kwargs) def base_OnBeginSize(*args, **kwargs): - """base_OnBeginSize(double w, double h)""" + """base_OnBeginSize(self, double w, double h)""" return _ogl.PyDividedShape_base_OnBeginSize(*args, **kwargs) def base_OnEndSize(*args, **kwargs): - """base_OnEndSize(double w, double h)""" + """base_OnEndSize(self, double w, double h)""" return _ogl.PyDividedShape_base_OnEndSize(*args, **kwargs) @@ -2377,7 +2410,7 @@ class PyDivisionShape(PyCompositeShape): def __repr__(self): return "<%s.%s; proxy of C++ wxPyDivisionShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): - """__init__() -> PyDivisionShape""" + """__init__(self) -> PyDivisionShape""" newobj = _ogl.new_PyDivisionShape(*args, **kwargs) self.this = newobj.this self.thisown = 1 @@ -2385,238 +2418,238 @@ class PyDivisionShape(PyCompositeShape): self._setOORandCallbackInfo(PyDivisionShape) def _setCallbackInfo(*args, **kwargs): - """_setCallbackInfo(PyObject self, PyObject _class)""" + """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _ogl.PyDivisionShape__setCallbackInfo(*args, **kwargs) def AdjustBottom(*args, **kwargs): - """AdjustBottom(double bottom, bool test)""" + """AdjustBottom(self, double bottom, bool test)""" return _ogl.PyDivisionShape_AdjustBottom(*args, **kwargs) def AdjustLeft(*args, **kwargs): - """AdjustLeft(double left, bool test)""" + """AdjustLeft(self, double left, bool test)""" return _ogl.PyDivisionShape_AdjustLeft(*args, **kwargs) def AdjustRight(*args, **kwargs): - """AdjustRight(double right, bool test)""" + """AdjustRight(self, double right, bool test)""" return _ogl.PyDivisionShape_AdjustRight(*args, **kwargs) def AdjustTop(*args, **kwargs): - """AdjustTop(double top, bool test)""" + """AdjustTop(self, double top, bool test)""" return _ogl.PyDivisionShape_AdjustTop(*args, **kwargs) def Divide(*args, **kwargs): - """Divide(int direction)""" + """Divide(self, int direction)""" return _ogl.PyDivisionShape_Divide(*args, **kwargs) def EditEdge(*args, **kwargs): - """EditEdge(int side)""" + """EditEdge(self, int side)""" return _ogl.PyDivisionShape_EditEdge(*args, **kwargs) def GetBottomSide(*args, **kwargs): - """GetBottomSide() -> PyDivisionShape""" + """GetBottomSide(self) -> PyDivisionShape""" return _ogl.PyDivisionShape_GetBottomSide(*args, **kwargs) def GetHandleSide(*args, **kwargs): - """GetHandleSide() -> int""" + """GetHandleSide(self) -> int""" return _ogl.PyDivisionShape_GetHandleSide(*args, **kwargs) def GetLeftSide(*args, **kwargs): - """GetLeftSide() -> PyDivisionShape""" + """GetLeftSide(self) -> PyDivisionShape""" return _ogl.PyDivisionShape_GetLeftSide(*args, **kwargs) def GetLeftSideColour(*args, **kwargs): - """GetLeftSideColour() -> String""" + """GetLeftSideColour(self) -> String""" return _ogl.PyDivisionShape_GetLeftSideColour(*args, **kwargs) def GetLeftSidePen(*args, **kwargs): - """GetLeftSidePen() -> wxPen""" + """GetLeftSidePen(self) -> wxPen""" return _ogl.PyDivisionShape_GetLeftSidePen(*args, **kwargs) def GetRightSide(*args, **kwargs): - """GetRightSide() -> PyDivisionShape""" + """GetRightSide(self) -> PyDivisionShape""" return _ogl.PyDivisionShape_GetRightSide(*args, **kwargs) def GetTopSide(*args, **kwargs): - """GetTopSide() -> PyDivisionShape""" + """GetTopSide(self) -> PyDivisionShape""" return _ogl.PyDivisionShape_GetTopSide(*args, **kwargs) def GetTopSidePen(*args, **kwargs): - """GetTopSidePen() -> wxPen""" + """GetTopSidePen(self) -> wxPen""" return _ogl.PyDivisionShape_GetTopSidePen(*args, **kwargs) def ResizeAdjoining(*args, **kwargs): - """ResizeAdjoining(int side, double newPos, bool test)""" + """ResizeAdjoining(self, int side, double newPos, bool test)""" return _ogl.PyDivisionShape_ResizeAdjoining(*args, **kwargs) def PopupMenu(*args, **kwargs): - """PopupMenu(double x, double y)""" + """PopupMenu(self, double x, double y)""" return _ogl.PyDivisionShape_PopupMenu(*args, **kwargs) def SetBottomSide(*args, **kwargs): - """SetBottomSide(PyDivisionShape shape)""" + """SetBottomSide(self, PyDivisionShape shape)""" return _ogl.PyDivisionShape_SetBottomSide(*args, **kwargs) def SetHandleSide(*args, **kwargs): - """SetHandleSide(int side)""" + """SetHandleSide(self, int side)""" return _ogl.PyDivisionShape_SetHandleSide(*args, **kwargs) def SetLeftSide(*args, **kwargs): - """SetLeftSide(PyDivisionShape shape)""" + """SetLeftSide(self, PyDivisionShape shape)""" return _ogl.PyDivisionShape_SetLeftSide(*args, **kwargs) def SetLeftSideColour(*args, **kwargs): - """SetLeftSideColour(String colour)""" + """SetLeftSideColour(self, String colour)""" return _ogl.PyDivisionShape_SetLeftSideColour(*args, **kwargs) def SetLeftSidePen(*args, **kwargs): - """SetLeftSidePen(wxPen pen)""" + """SetLeftSidePen(self, wxPen pen)""" return _ogl.PyDivisionShape_SetLeftSidePen(*args, **kwargs) def SetRightSide(*args, **kwargs): - """SetRightSide(PyDivisionShape shape)""" + """SetRightSide(self, PyDivisionShape shape)""" return _ogl.PyDivisionShape_SetRightSide(*args, **kwargs) def SetTopSide(*args, **kwargs): - """SetTopSide(PyDivisionShape shape)""" + """SetTopSide(self, PyDivisionShape shape)""" return _ogl.PyDivisionShape_SetTopSide(*args, **kwargs) def SetTopSideColour(*args, **kwargs): - """SetTopSideColour(String colour)""" + """SetTopSideColour(self, String colour)""" return _ogl.PyDivisionShape_SetTopSideColour(*args, **kwargs) def SetTopSidePen(*args, **kwargs): - """SetTopSidePen(wxPen pen)""" + """SetTopSidePen(self, wxPen pen)""" return _ogl.PyDivisionShape_SetTopSidePen(*args, **kwargs) def base_OnDelete(*args, **kwargs): - """base_OnDelete()""" + """base_OnDelete(self)""" return _ogl.PyDivisionShape_base_OnDelete(*args, **kwargs) def base_OnDraw(*args, **kwargs): - """base_OnDraw(DC dc)""" + """base_OnDraw(self, DC dc)""" return _ogl.PyDivisionShape_base_OnDraw(*args, **kwargs) def base_OnDrawContents(*args, **kwargs): - """base_OnDrawContents(DC dc)""" + """base_OnDrawContents(self, DC dc)""" return _ogl.PyDivisionShape_base_OnDrawContents(*args, **kwargs) def base_OnDrawBranches(*args, **kwargs): - """base_OnDrawBranches(DC dc, bool erase=FALSE)""" + """base_OnDrawBranches(self, DC dc, bool erase=FALSE)""" return _ogl.PyDivisionShape_base_OnDrawBranches(*args, **kwargs) def base_OnMoveLinks(*args, **kwargs): - """base_OnMoveLinks(DC dc)""" + """base_OnMoveLinks(self, DC dc)""" return _ogl.PyDivisionShape_base_OnMoveLinks(*args, **kwargs) def base_OnErase(*args, **kwargs): - """base_OnErase(DC dc)""" + """base_OnErase(self, DC dc)""" return _ogl.PyDivisionShape_base_OnErase(*args, **kwargs) def base_OnEraseContents(*args, **kwargs): - """base_OnEraseContents(DC dc)""" + """base_OnEraseContents(self, DC dc)""" return _ogl.PyDivisionShape_base_OnEraseContents(*args, **kwargs) def base_OnHighlight(*args, **kwargs): - """base_OnHighlight(DC dc)""" + """base_OnHighlight(self, DC dc)""" return _ogl.PyDivisionShape_base_OnHighlight(*args, **kwargs) def base_OnLeftClick(*args, **kwargs): - """base_OnLeftClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnLeftClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyDivisionShape_base_OnLeftClick(*args, **kwargs) def base_OnLeftDoubleClick(*args, **kwargs): - """base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnLeftDoubleClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyDivisionShape_base_OnLeftDoubleClick(*args, **kwargs) def base_OnRightClick(*args, **kwargs): - """base_OnRightClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnRightClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyDivisionShape_base_OnRightClick(*args, **kwargs) def base_OnSize(*args, **kwargs): - """base_OnSize(double x, double y)""" + """base_OnSize(self, double x, double y)""" return _ogl.PyDivisionShape_base_OnSize(*args, **kwargs) def base_OnMovePre(*args, **kwargs): """ - base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, + base_OnMovePre(self, DC dc, double x, double y, double old_x, double old_y, bool display=True) -> bool """ return _ogl.PyDivisionShape_base_OnMovePre(*args, **kwargs) def base_OnMovePost(*args, **kwargs): """ - base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, + base_OnMovePost(self, DC dc, double x, double y, double old_x, double old_y, bool display=True) """ return _ogl.PyDivisionShape_base_OnMovePost(*args, **kwargs) def base_OnDragLeft(*args, **kwargs): - """base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)""" + """base_OnDragLeft(self, bool draw, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyDivisionShape_base_OnDragLeft(*args, **kwargs) def base_OnBeginDragLeft(*args, **kwargs): - """base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)""" + """base_OnBeginDragLeft(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyDivisionShape_base_OnBeginDragLeft(*args, **kwargs) def base_OnEndDragLeft(*args, **kwargs): - """base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)""" + """base_OnEndDragLeft(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyDivisionShape_base_OnEndDragLeft(*args, **kwargs) def base_OnDragRight(*args, **kwargs): - """base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)""" + """base_OnDragRight(self, bool draw, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyDivisionShape_base_OnDragRight(*args, **kwargs) def base_OnBeginDragRight(*args, **kwargs): - """base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)""" + """base_OnBeginDragRight(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyDivisionShape_base_OnBeginDragRight(*args, **kwargs) def base_OnEndDragRight(*args, **kwargs): - """base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)""" + """base_OnEndDragRight(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyDivisionShape_base_OnEndDragRight(*args, **kwargs) def base_OnDrawOutline(*args, **kwargs): - """base_OnDrawOutline(DC dc, double x, double y, double w, double h)""" + """base_OnDrawOutline(self, DC dc, double x, double y, double w, double h)""" return _ogl.PyDivisionShape_base_OnDrawOutline(*args, **kwargs) def base_OnDrawControlPoints(*args, **kwargs): - """base_OnDrawControlPoints(DC dc)""" + """base_OnDrawControlPoints(self, DC dc)""" return _ogl.PyDivisionShape_base_OnDrawControlPoints(*args, **kwargs) def base_OnEraseControlPoints(*args, **kwargs): - """base_OnEraseControlPoints(DC dc)""" + """base_OnEraseControlPoints(self, DC dc)""" return _ogl.PyDivisionShape_base_OnEraseControlPoints(*args, **kwargs) def base_OnMoveLink(*args, **kwargs): - """base_OnMoveLink(DC dc, bool moveControlPoints=True)""" + """base_OnMoveLink(self, DC dc, bool moveControlPoints=True)""" return _ogl.PyDivisionShape_base_OnMoveLink(*args, **kwargs) def base_OnSizingDragLeft(*args, **kwargs): """ - base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, + base_OnSizingDragLeft(self, PyControlPoint pt, bool draw, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyDivisionShape_base_OnSizingDragLeft(*args, **kwargs) def base_OnSizingBeginDragLeft(*args, **kwargs): """ - base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, + base_OnSizingBeginDragLeft(self, PyControlPoint pt, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyDivisionShape_base_OnSizingBeginDragLeft(*args, **kwargs) def base_OnSizingEndDragLeft(*args, **kwargs): """ - base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, + base_OnSizingEndDragLeft(self, PyControlPoint pt, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyDivisionShape_base_OnSizingEndDragLeft(*args, **kwargs) def base_OnBeginSize(*args, **kwargs): - """base_OnBeginSize(double w, double h)""" + """base_OnBeginSize(self, double w, double h)""" return _ogl.PyDivisionShape_base_OnBeginSize(*args, **kwargs) def base_OnEndSize(*args, **kwargs): - """base_OnEndSize(double w, double h)""" + """base_OnEndSize(self, double w, double h)""" return _ogl.PyDivisionShape_base_OnEndSize(*args, **kwargs) @@ -2631,7 +2664,7 @@ class PyEllipseShape(PyShape): def __repr__(self): return "<%s.%s; proxy of C++ wxPyEllipseShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): - """__init__(double width=0.0, double height=0.0) -> PyEllipseShape""" + """__init__(self, double width=0.0, double height=0.0) -> PyEllipseShape""" newobj = _ogl.new_PyEllipseShape(*args, **kwargs) self.this = newobj.this self.thisown = 1 @@ -2639,134 +2672,134 @@ class PyEllipseShape(PyShape): self._setOORandCallbackInfo(PyEllipseShape) def _setCallbackInfo(*args, **kwargs): - """_setCallbackInfo(PyObject self, PyObject _class)""" + """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _ogl.PyEllipseShape__setCallbackInfo(*args, **kwargs) def base_OnDraw(*args, **kwargs): - """base_OnDraw(DC dc)""" + """base_OnDraw(self, DC dc)""" return _ogl.PyEllipseShape_base_OnDraw(*args, **kwargs) def base_OnDrawContents(*args, **kwargs): - """base_OnDrawContents(DC dc)""" + """base_OnDrawContents(self, DC dc)""" return _ogl.PyEllipseShape_base_OnDrawContents(*args, **kwargs) def base_OnDrawBranches(*args, **kwargs): - """base_OnDrawBranches(DC dc, bool erase=FALSE)""" + """base_OnDrawBranches(self, DC dc, bool erase=FALSE)""" return _ogl.PyEllipseShape_base_OnDrawBranches(*args, **kwargs) def base_OnMoveLinks(*args, **kwargs): - """base_OnMoveLinks(DC dc)""" + """base_OnMoveLinks(self, DC dc)""" return _ogl.PyEllipseShape_base_OnMoveLinks(*args, **kwargs) def base_OnErase(*args, **kwargs): - """base_OnErase(DC dc)""" + """base_OnErase(self, DC dc)""" return _ogl.PyEllipseShape_base_OnErase(*args, **kwargs) def base_OnEraseContents(*args, **kwargs): - """base_OnEraseContents(DC dc)""" + """base_OnEraseContents(self, DC dc)""" return _ogl.PyEllipseShape_base_OnEraseContents(*args, **kwargs) def base_OnHighlight(*args, **kwargs): - """base_OnHighlight(DC dc)""" + """base_OnHighlight(self, DC dc)""" return _ogl.PyEllipseShape_base_OnHighlight(*args, **kwargs) def base_OnLeftClick(*args, **kwargs): - """base_OnLeftClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnLeftClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyEllipseShape_base_OnLeftClick(*args, **kwargs) def base_OnLeftDoubleClick(*args, **kwargs): - """base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnLeftDoubleClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyEllipseShape_base_OnLeftDoubleClick(*args, **kwargs) def base_OnRightClick(*args, **kwargs): - """base_OnRightClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnRightClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyEllipseShape_base_OnRightClick(*args, **kwargs) def base_OnSize(*args, **kwargs): - """base_OnSize(double x, double y)""" + """base_OnSize(self, double x, double y)""" return _ogl.PyEllipseShape_base_OnSize(*args, **kwargs) def base_OnMovePre(*args, **kwargs): """ - base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, + base_OnMovePre(self, DC dc, double x, double y, double old_x, double old_y, bool display=True) -> bool """ return _ogl.PyEllipseShape_base_OnMovePre(*args, **kwargs) def base_OnMovePost(*args, **kwargs): """ - base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, + base_OnMovePost(self, DC dc, double x, double y, double old_x, double old_y, bool display=True) """ return _ogl.PyEllipseShape_base_OnMovePost(*args, **kwargs) def base_OnDragLeft(*args, **kwargs): - """base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)""" + """base_OnDragLeft(self, bool draw, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyEllipseShape_base_OnDragLeft(*args, **kwargs) def base_OnBeginDragLeft(*args, **kwargs): - """base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)""" + """base_OnBeginDragLeft(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyEllipseShape_base_OnBeginDragLeft(*args, **kwargs) def base_OnEndDragLeft(*args, **kwargs): - """base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)""" + """base_OnEndDragLeft(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyEllipseShape_base_OnEndDragLeft(*args, **kwargs) def base_OnDragRight(*args, **kwargs): - """base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)""" + """base_OnDragRight(self, bool draw, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyEllipseShape_base_OnDragRight(*args, **kwargs) def base_OnBeginDragRight(*args, **kwargs): - """base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)""" + """base_OnBeginDragRight(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyEllipseShape_base_OnBeginDragRight(*args, **kwargs) def base_OnEndDragRight(*args, **kwargs): - """base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)""" + """base_OnEndDragRight(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyEllipseShape_base_OnEndDragRight(*args, **kwargs) def base_OnDrawOutline(*args, **kwargs): - """base_OnDrawOutline(DC dc, double x, double y, double w, double h)""" + """base_OnDrawOutline(self, DC dc, double x, double y, double w, double h)""" return _ogl.PyEllipseShape_base_OnDrawOutline(*args, **kwargs) def base_OnDrawControlPoints(*args, **kwargs): - """base_OnDrawControlPoints(DC dc)""" + """base_OnDrawControlPoints(self, DC dc)""" return _ogl.PyEllipseShape_base_OnDrawControlPoints(*args, **kwargs) def base_OnEraseControlPoints(*args, **kwargs): - """base_OnEraseControlPoints(DC dc)""" + """base_OnEraseControlPoints(self, DC dc)""" return _ogl.PyEllipseShape_base_OnEraseControlPoints(*args, **kwargs) def base_OnMoveLink(*args, **kwargs): - """base_OnMoveLink(DC dc, bool moveControlPoints=True)""" + """base_OnMoveLink(self, DC dc, bool moveControlPoints=True)""" return _ogl.PyEllipseShape_base_OnMoveLink(*args, **kwargs) def base_OnSizingDragLeft(*args, **kwargs): """ - base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, + base_OnSizingDragLeft(self, PyControlPoint pt, bool draw, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyEllipseShape_base_OnSizingDragLeft(*args, **kwargs) def base_OnSizingBeginDragLeft(*args, **kwargs): """ - base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, + base_OnSizingBeginDragLeft(self, PyControlPoint pt, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyEllipseShape_base_OnSizingBeginDragLeft(*args, **kwargs) def base_OnSizingEndDragLeft(*args, **kwargs): """ - base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, + base_OnSizingEndDragLeft(self, PyControlPoint pt, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyEllipseShape_base_OnSizingEndDragLeft(*args, **kwargs) def base_OnBeginSize(*args, **kwargs): - """base_OnBeginSize(double w, double h)""" + """base_OnBeginSize(self, double w, double h)""" return _ogl.PyEllipseShape_base_OnBeginSize(*args, **kwargs) def base_OnEndSize(*args, **kwargs): - """base_OnEndSize(double w, double h)""" + """base_OnEndSize(self, double w, double h)""" return _ogl.PyEllipseShape_base_OnEndSize(*args, **kwargs) @@ -2781,7 +2814,7 @@ class PyCircleShape(PyEllipseShape): def __repr__(self): return "<%s.%s; proxy of C++ wxPyCircleShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): - """__init__(double width=0.0) -> PyCircleShape""" + """__init__(self, double width=0.0) -> PyCircleShape""" newobj = _ogl.new_PyCircleShape(*args, **kwargs) self.this = newobj.this self.thisown = 1 @@ -2789,134 +2822,134 @@ class PyCircleShape(PyEllipseShape): self._setOORandCallbackInfo(PyCircleShape) def _setCallbackInfo(*args, **kwargs): - """_setCallbackInfo(PyObject self, PyObject _class)""" + """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _ogl.PyCircleShape__setCallbackInfo(*args, **kwargs) def base_OnDraw(*args, **kwargs): - """base_OnDraw(DC dc)""" + """base_OnDraw(self, DC dc)""" return _ogl.PyCircleShape_base_OnDraw(*args, **kwargs) def base_OnDrawContents(*args, **kwargs): - """base_OnDrawContents(DC dc)""" + """base_OnDrawContents(self, DC dc)""" return _ogl.PyCircleShape_base_OnDrawContents(*args, **kwargs) def base_OnDrawBranches(*args, **kwargs): - """base_OnDrawBranches(DC dc, bool erase=FALSE)""" + """base_OnDrawBranches(self, DC dc, bool erase=FALSE)""" return _ogl.PyCircleShape_base_OnDrawBranches(*args, **kwargs) def base_OnMoveLinks(*args, **kwargs): - """base_OnMoveLinks(DC dc)""" + """base_OnMoveLinks(self, DC dc)""" return _ogl.PyCircleShape_base_OnMoveLinks(*args, **kwargs) def base_OnErase(*args, **kwargs): - """base_OnErase(DC dc)""" + """base_OnErase(self, DC dc)""" return _ogl.PyCircleShape_base_OnErase(*args, **kwargs) def base_OnEraseContents(*args, **kwargs): - """base_OnEraseContents(DC dc)""" + """base_OnEraseContents(self, DC dc)""" return _ogl.PyCircleShape_base_OnEraseContents(*args, **kwargs) def base_OnHighlight(*args, **kwargs): - """base_OnHighlight(DC dc)""" + """base_OnHighlight(self, DC dc)""" return _ogl.PyCircleShape_base_OnHighlight(*args, **kwargs) def base_OnLeftClick(*args, **kwargs): - """base_OnLeftClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnLeftClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyCircleShape_base_OnLeftClick(*args, **kwargs) def base_OnLeftDoubleClick(*args, **kwargs): - """base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnLeftDoubleClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyCircleShape_base_OnLeftDoubleClick(*args, **kwargs) def base_OnRightClick(*args, **kwargs): - """base_OnRightClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnRightClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyCircleShape_base_OnRightClick(*args, **kwargs) def base_OnSize(*args, **kwargs): - """base_OnSize(double x, double y)""" + """base_OnSize(self, double x, double y)""" return _ogl.PyCircleShape_base_OnSize(*args, **kwargs) def base_OnMovePre(*args, **kwargs): """ - base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, + base_OnMovePre(self, DC dc, double x, double y, double old_x, double old_y, bool display=True) -> bool """ return _ogl.PyCircleShape_base_OnMovePre(*args, **kwargs) def base_OnMovePost(*args, **kwargs): """ - base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, + base_OnMovePost(self, DC dc, double x, double y, double old_x, double old_y, bool display=True) """ return _ogl.PyCircleShape_base_OnMovePost(*args, **kwargs) def base_OnDragLeft(*args, **kwargs): - """base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)""" + """base_OnDragLeft(self, bool draw, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyCircleShape_base_OnDragLeft(*args, **kwargs) def base_OnBeginDragLeft(*args, **kwargs): - """base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)""" + """base_OnBeginDragLeft(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyCircleShape_base_OnBeginDragLeft(*args, **kwargs) def base_OnEndDragLeft(*args, **kwargs): - """base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)""" + """base_OnEndDragLeft(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyCircleShape_base_OnEndDragLeft(*args, **kwargs) def base_OnDragRight(*args, **kwargs): - """base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)""" + """base_OnDragRight(self, bool draw, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyCircleShape_base_OnDragRight(*args, **kwargs) def base_OnBeginDragRight(*args, **kwargs): - """base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)""" + """base_OnBeginDragRight(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyCircleShape_base_OnBeginDragRight(*args, **kwargs) def base_OnEndDragRight(*args, **kwargs): - """base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)""" + """base_OnEndDragRight(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyCircleShape_base_OnEndDragRight(*args, **kwargs) def base_OnDrawOutline(*args, **kwargs): - """base_OnDrawOutline(DC dc, double x, double y, double w, double h)""" + """base_OnDrawOutline(self, DC dc, double x, double y, double w, double h)""" return _ogl.PyCircleShape_base_OnDrawOutline(*args, **kwargs) def base_OnDrawControlPoints(*args, **kwargs): - """base_OnDrawControlPoints(DC dc)""" + """base_OnDrawControlPoints(self, DC dc)""" return _ogl.PyCircleShape_base_OnDrawControlPoints(*args, **kwargs) def base_OnEraseControlPoints(*args, **kwargs): - """base_OnEraseControlPoints(DC dc)""" + """base_OnEraseControlPoints(self, DC dc)""" return _ogl.PyCircleShape_base_OnEraseControlPoints(*args, **kwargs) def base_OnMoveLink(*args, **kwargs): - """base_OnMoveLink(DC dc, bool moveControlPoints=True)""" + """base_OnMoveLink(self, DC dc, bool moveControlPoints=True)""" return _ogl.PyCircleShape_base_OnMoveLink(*args, **kwargs) def base_OnSizingDragLeft(*args, **kwargs): """ - base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, + base_OnSizingDragLeft(self, PyControlPoint pt, bool draw, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyCircleShape_base_OnSizingDragLeft(*args, **kwargs) def base_OnSizingBeginDragLeft(*args, **kwargs): """ - base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, + base_OnSizingBeginDragLeft(self, PyControlPoint pt, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyCircleShape_base_OnSizingBeginDragLeft(*args, **kwargs) def base_OnSizingEndDragLeft(*args, **kwargs): """ - base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, + base_OnSizingEndDragLeft(self, PyControlPoint pt, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyCircleShape_base_OnSizingEndDragLeft(*args, **kwargs) def base_OnBeginSize(*args, **kwargs): - """base_OnBeginSize(double w, double h)""" + """base_OnBeginSize(self, double w, double h)""" return _ogl.PyCircleShape_base_OnBeginSize(*args, **kwargs) def base_OnEndSize(*args, **kwargs): - """base_OnEndSize(double w, double h)""" + """base_OnEndSize(self, double w, double h)""" return _ogl.PyCircleShape_base_OnEndSize(*args, **kwargs) @@ -2927,12 +2960,12 @@ class PyCircleShapePtr(PyCircleShape): self.__class__ = PyCircleShape _ogl.PyCircleShape_swigregister(PyCircleShapePtr) -class ArrowHead(core.Object): +class ArrowHead(_core.Object): def __repr__(self): return "<%s.%s; proxy of C++ wxArrowHead instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): """ - __init__(int type=0, int end=0, double size=0.0, double dist=0.0, + __init__(self, int type=0, int end=0, double size=0.0, double dist=0.0, String name=EmptyString, PseudoMetaFile mf=None, long arrowId=-1) -> ArrowHead """ @@ -2941,73 +2974,73 @@ class ArrowHead(core.Object): self.thisown = 1 del newobj.thisown def __del__(self, destroy=_ogl.delete_ArrowHead): - """__del__()""" + """__del__(self)""" try: if self.thisown: destroy(self) except: pass def _GetType(*args, **kwargs): - """_GetType() -> int""" + """_GetType(self) -> int""" return _ogl.ArrowHead__GetType(*args, **kwargs) def GetPosition(*args, **kwargs): - """GetPosition() -> int""" + """GetPosition(self) -> int""" return _ogl.ArrowHead_GetPosition(*args, **kwargs) def SetPosition(*args, **kwargs): - """SetPosition(int pos)""" + """SetPosition(self, int pos)""" return _ogl.ArrowHead_SetPosition(*args, **kwargs) def GetXOffset(*args, **kwargs): - """GetXOffset() -> double""" + """GetXOffset(self) -> double""" return _ogl.ArrowHead_GetXOffset(*args, **kwargs) def GetYOffset(*args, **kwargs): - """GetYOffset() -> double""" + """GetYOffset(self) -> double""" return _ogl.ArrowHead_GetYOffset(*args, **kwargs) def GetSpacing(*args, **kwargs): - """GetSpacing() -> double""" + """GetSpacing(self) -> double""" return _ogl.ArrowHead_GetSpacing(*args, **kwargs) def GetSize(*args, **kwargs): - """GetSize() -> double""" + """GetSize(self) -> double""" return _ogl.ArrowHead_GetSize(*args, **kwargs) def GetName(*args, **kwargs): - """GetName() -> String""" + """GetName(self) -> String""" return _ogl.ArrowHead_GetName(*args, **kwargs) def SetXOffset(*args, **kwargs): - """SetXOffset(double x)""" + """SetXOffset(self, double x)""" return _ogl.ArrowHead_SetXOffset(*args, **kwargs) def SetYOffset(*args, **kwargs): - """SetYOffset(double y)""" + """SetYOffset(self, double y)""" return _ogl.ArrowHead_SetYOffset(*args, **kwargs) def GetMetaFile(*args, **kwargs): - """GetMetaFile() -> PseudoMetaFile""" + """GetMetaFile(self) -> PseudoMetaFile""" return _ogl.ArrowHead_GetMetaFile(*args, **kwargs) def GetId(*args, **kwargs): - """GetId() -> long""" + """GetId(self) -> long""" return _ogl.ArrowHead_GetId(*args, **kwargs) def GetArrowEnd(*args, **kwargs): - """GetArrowEnd() -> int""" + """GetArrowEnd(self) -> int""" return _ogl.ArrowHead_GetArrowEnd(*args, **kwargs) def GetArrowSize(*args, **kwargs): - """GetArrowSize() -> double""" + """GetArrowSize(self) -> double""" return _ogl.ArrowHead_GetArrowSize(*args, **kwargs) def SetSize(*args, **kwargs): - """SetSize(double size)""" + """SetSize(self, double size)""" return _ogl.ArrowHead_SetSize(*args, **kwargs) def SetSpacing(*args, **kwargs): - """SetSpacing(double sp)""" + """SetSpacing(self, double sp)""" return _ogl.ArrowHead_SetSpacing(*args, **kwargs) @@ -3022,7 +3055,7 @@ class PyLineShape(PyShape): def __repr__(self): return "<%s.%s; proxy of C++ wxPyLineShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): - """__init__() -> PyLineShape""" + """__init__(self) -> PyLineShape""" newobj = _ogl.new_PyLineShape(*args, **kwargs) self.this = newobj.this self.thisown = 1 @@ -3030,298 +3063,326 @@ class PyLineShape(PyShape): self._setOORandCallbackInfo(PyLineShape) def _setCallbackInfo(*args, **kwargs): - """_setCallbackInfo(PyObject self, PyObject _class)""" + """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _ogl.PyLineShape__setCallbackInfo(*args, **kwargs) def AddArrow(*args, **kwargs): """ - AddArrow(int type, int end=ARROW_POSITION_END, double arrowSize=10.0, + AddArrow(self, int type, int end=ARROW_POSITION_END, double arrowSize=10.0, double xOffset=0.0, String name=EmptyString, PseudoMetaFile mf=None, long arrowId=-1) """ return _ogl.PyLineShape_AddArrow(*args, **kwargs) def AddArrowOrdered(*args, **kwargs): - """AddArrowOrdered(ArrowHead arrow, PyObject referenceList, int end)""" + """AddArrowOrdered(self, ArrowHead arrow, PyObject referenceList, int end)""" return _ogl.PyLineShape_AddArrowOrdered(*args, **kwargs) def ClearArrow(*args, **kwargs): - """ClearArrow(String name) -> bool""" + """ClearArrow(self, String name) -> bool""" return _ogl.PyLineShape_ClearArrow(*args, **kwargs) def ClearArrowsAtPosition(*args, **kwargs): - """ClearArrowsAtPosition(int position=-1)""" + """ClearArrowsAtPosition(self, int position=-1)""" return _ogl.PyLineShape_ClearArrowsAtPosition(*args, **kwargs) def DrawArrow(*args, **kwargs): - """DrawArrow(DC dc, ArrowHead arrow, double xOffset, bool proportionalOffset)""" + """DrawArrow(self, DC dc, ArrowHead arrow, double xOffset, bool proportionalOffset)""" return _ogl.PyLineShape_DrawArrow(*args, **kwargs) def DeleteArrowHeadId(*args, **kwargs): - """DeleteArrowHeadId(long arrowId) -> bool""" + """DeleteArrowHeadId(self, long arrowId) -> bool""" return _ogl.PyLineShape_DeleteArrowHeadId(*args, **kwargs) def DeleteArrowHead(*args, **kwargs): - """DeleteArrowHead(int position, String name) -> bool""" + """DeleteArrowHead(self, int position, String name) -> bool""" return _ogl.PyLineShape_DeleteArrowHead(*args, **kwargs) def DeleteLineControlPoint(*args, **kwargs): - """DeleteLineControlPoint() -> bool""" + """DeleteLineControlPoint(self) -> bool""" return _ogl.PyLineShape_DeleteLineControlPoint(*args, **kwargs) def DrawArrows(*args, **kwargs): - """DrawArrows(DC dc)""" + """DrawArrows(self, DC dc)""" return _ogl.PyLineShape_DrawArrows(*args, **kwargs) def DrawRegion(*args, **kwargs): - """DrawRegion(DC dc, ShapeRegion region, double x, double y)""" + """DrawRegion(self, DC dc, ShapeRegion region, double x, double y)""" return _ogl.PyLineShape_DrawRegion(*args, **kwargs) def EraseRegion(*args, **kwargs): - """EraseRegion(DC dc, ShapeRegion region, double x, double y)""" + """EraseRegion(self, DC dc, ShapeRegion region, double x, double y)""" return _ogl.PyLineShape_EraseRegion(*args, **kwargs) def FindArrowHeadId(*args, **kwargs): - """FindArrowHeadId(long arrowId) -> ArrowHead""" + """FindArrowHeadId(self, long arrowId) -> ArrowHead""" return _ogl.PyLineShape_FindArrowHeadId(*args, **kwargs) def FindArrowHead(*args, **kwargs): - """FindArrowHead(int position, String name) -> ArrowHead""" + """FindArrowHead(self, int position, String name) -> ArrowHead""" return _ogl.PyLineShape_FindArrowHead(*args, **kwargs) def FindLineEndPoints(*args, **kwargs): - """FindLineEndPoints(double OUTPUT, double OUTPUT, double OUTPUT, double OUTPUT)""" + """FindLineEndPoints(self, double OUTPUT, double OUTPUT, double OUTPUT, double OUTPUT)""" return _ogl.PyLineShape_FindLineEndPoints(*args, **kwargs) def FindLinePosition(*args, **kwargs): - """FindLinePosition(double x, double y) -> int""" + """FindLinePosition(self, double x, double y) -> int""" return _ogl.PyLineShape_FindLinePosition(*args, **kwargs) def FindMinimumWidth(*args, **kwargs): - """FindMinimumWidth() -> double""" + """FindMinimumWidth(self) -> double""" return _ogl.PyLineShape_FindMinimumWidth(*args, **kwargs) def FindNth(*args, **kwargs): - """FindNth(PyShape image, int OUTPUT, int OUTPUT, bool incoming)""" + """FindNth(self, PyShape image, int OUTPUT, int OUTPUT, bool incoming)""" return _ogl.PyLineShape_FindNth(*args, **kwargs) def GetAttachmentFrom(*args, **kwargs): - """GetAttachmentFrom() -> int""" + """GetAttachmentFrom(self) -> int""" return _ogl.PyLineShape_GetAttachmentFrom(*args, **kwargs) def GetAttachmentTo(*args, **kwargs): - """GetAttachmentTo() -> int""" + """GetAttachmentTo(self) -> int""" return _ogl.PyLineShape_GetAttachmentTo(*args, **kwargs) def GetEnds(*args, **kwargs): - """GetEnds(double OUTPUT, double OUTPUT, double OUTPUT, double OUTPUT)""" + """GetEnds(self, double OUTPUT, double OUTPUT, double OUTPUT, double OUTPUT)""" return _ogl.PyLineShape_GetEnds(*args, **kwargs) def GetFrom(*args, **kwargs): - """GetFrom() -> PyShape""" + """GetFrom(self) -> PyShape""" return _ogl.PyLineShape_GetFrom(*args, **kwargs) def GetLabelPosition(*args, **kwargs): - """GetLabelPosition(int position, double OUTPUT, double OUTPUT)""" + """GetLabelPosition(self, int position, double OUTPUT, double OUTPUT)""" return _ogl.PyLineShape_GetLabelPosition(*args, **kwargs) def GetNextControlPoint(*args, **kwargs): - """GetNextControlPoint(PyShape shape) -> RealPoint""" + """GetNextControlPoint(self, PyShape shape) -> RealPoint""" return _ogl.PyLineShape_GetNextControlPoint(*args, **kwargs) def GetTo(*args, **kwargs): - """GetTo() -> PyShape""" + """GetTo(self) -> PyShape""" return _ogl.PyLineShape_GetTo(*args, **kwargs) def Initialise(*args, **kwargs): - """Initialise()""" + """Initialise(self)""" return _ogl.PyLineShape_Initialise(*args, **kwargs) def InsertLineControlPoint(*args, **kwargs): - """InsertLineControlPoint(DC dc)""" + """InsertLineControlPoint(self, DC dc)""" return _ogl.PyLineShape_InsertLineControlPoint(*args, **kwargs) def IsEnd(*args, **kwargs): - """IsEnd(PyShape shape) -> bool""" + """IsEnd(self, PyShape shape) -> bool""" return _ogl.PyLineShape_IsEnd(*args, **kwargs) def IsSpline(*args, **kwargs): - """IsSpline() -> bool""" + """IsSpline(self) -> bool""" return _ogl.PyLineShape_IsSpline(*args, **kwargs) def MakeLineControlPoints(*args, **kwargs): - """MakeLineControlPoints(int n)""" + """MakeLineControlPoints(self, int n)""" return _ogl.PyLineShape_MakeLineControlPoints(*args, **kwargs) def GetLineControlPoints(*args, **kwargs): - """GetLineControlPoints() -> PyObject""" + """GetLineControlPoints(self) -> PyObject""" return _ogl.PyLineShape_GetLineControlPoints(*args, **kwargs) + def SetLineControlPoints(*args, **kwargs): + """SetLineControlPoints(self, PyObject list)""" + return _ogl.PyLineShape_SetLineControlPoints(*args, **kwargs) + def SetAttachmentFrom(*args, **kwargs): - """SetAttachmentFrom(int fromAttach)""" + """SetAttachmentFrom(self, int fromAttach)""" return _ogl.PyLineShape_SetAttachmentFrom(*args, **kwargs) def SetAttachments(*args, **kwargs): - """SetAttachments(int fromAttach, int toAttach)""" + """SetAttachments(self, int fromAttach, int toAttach)""" return _ogl.PyLineShape_SetAttachments(*args, **kwargs) def SetAttachmentTo(*args, **kwargs): - """SetAttachmentTo(int toAttach)""" + """SetAttachmentTo(self, int toAttach)""" return _ogl.PyLineShape_SetAttachmentTo(*args, **kwargs) def SetEnds(*args, **kwargs): - """SetEnds(double x1, double y1, double x2, double y2)""" + """SetEnds(self, double x1, double y1, double x2, double y2)""" return _ogl.PyLineShape_SetEnds(*args, **kwargs) def SetFrom(*args, **kwargs): - """SetFrom(PyShape object)""" + """SetFrom(self, PyShape object)""" return _ogl.PyLineShape_SetFrom(*args, **kwargs) def SetIgnoreOffsets(*args, **kwargs): - """SetIgnoreOffsets(bool ignore)""" + """SetIgnoreOffsets(self, bool ignore)""" return _ogl.PyLineShape_SetIgnoreOffsets(*args, **kwargs) def SetSpline(*args, **kwargs): - """SetSpline(bool spline)""" + """SetSpline(self, bool spline)""" return _ogl.PyLineShape_SetSpline(*args, **kwargs) def SetTo(*args, **kwargs): - """SetTo(PyShape object)""" + """SetTo(self, PyShape object)""" return _ogl.PyLineShape_SetTo(*args, **kwargs) def Straighten(*args, **kwargs): - """Straighten(DC dc=None)""" + """Straighten(self, DC dc=None)""" return _ogl.PyLineShape_Straighten(*args, **kwargs) def Unlink(*args, **kwargs): - """Unlink()""" + """Unlink(self)""" return _ogl.PyLineShape_Unlink(*args, **kwargs) + def SetAlignmentOrientation(*args, **kwargs): + """SetAlignmentOrientation(self, bool isEnd, bool isHoriz)""" + return _ogl.PyLineShape_SetAlignmentOrientation(*args, **kwargs) + + def SetAlignmentType(*args, **kwargs): + """SetAlignmentType(self, bool isEnd, int alignType)""" + return _ogl.PyLineShape_SetAlignmentType(*args, **kwargs) + + def GetAlignmentOrientation(*args, **kwargs): + """GetAlignmentOrientation(self, bool isEnd) -> bool""" + return _ogl.PyLineShape_GetAlignmentOrientation(*args, **kwargs) + + def GetAlignmentType(*args, **kwargs): + """GetAlignmentType(self, bool isEnd) -> int""" + return _ogl.PyLineShape_GetAlignmentType(*args, **kwargs) + + def GetAlignmentStart(*args, **kwargs): + """GetAlignmentStart(self) -> int""" + return _ogl.PyLineShape_GetAlignmentStart(*args, **kwargs) + + def GetAlignmentEnd(*args, **kwargs): + """GetAlignmentEnd(self) -> int""" + return _ogl.PyLineShape_GetAlignmentEnd(*args, **kwargs) + def base_OnDraw(*args, **kwargs): - """base_OnDraw(DC dc)""" + """base_OnDraw(self, DC dc)""" return _ogl.PyLineShape_base_OnDraw(*args, **kwargs) def base_OnDrawContents(*args, **kwargs): - """base_OnDrawContents(DC dc)""" + """base_OnDrawContents(self, DC dc)""" return _ogl.PyLineShape_base_OnDrawContents(*args, **kwargs) def base_OnDrawBranches(*args, **kwargs): - """base_OnDrawBranches(DC dc, bool erase=FALSE)""" + """base_OnDrawBranches(self, DC dc, bool erase=FALSE)""" return _ogl.PyLineShape_base_OnDrawBranches(*args, **kwargs) def base_OnMoveLinks(*args, **kwargs): - """base_OnMoveLinks(DC dc)""" + """base_OnMoveLinks(self, DC dc)""" return _ogl.PyLineShape_base_OnMoveLinks(*args, **kwargs) def base_OnErase(*args, **kwargs): - """base_OnErase(DC dc)""" + """base_OnErase(self, DC dc)""" return _ogl.PyLineShape_base_OnErase(*args, **kwargs) def base_OnEraseContents(*args, **kwargs): - """base_OnEraseContents(DC dc)""" + """base_OnEraseContents(self, DC dc)""" return _ogl.PyLineShape_base_OnEraseContents(*args, **kwargs) def base_OnHighlight(*args, **kwargs): - """base_OnHighlight(DC dc)""" + """base_OnHighlight(self, DC dc)""" return _ogl.PyLineShape_base_OnHighlight(*args, **kwargs) def base_OnLeftClick(*args, **kwargs): - """base_OnLeftClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnLeftClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyLineShape_base_OnLeftClick(*args, **kwargs) def base_OnLeftDoubleClick(*args, **kwargs): - """base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnLeftDoubleClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyLineShape_base_OnLeftDoubleClick(*args, **kwargs) def base_OnRightClick(*args, **kwargs): - """base_OnRightClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnRightClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyLineShape_base_OnRightClick(*args, **kwargs) def base_OnSize(*args, **kwargs): - """base_OnSize(double x, double y)""" + """base_OnSize(self, double x, double y)""" return _ogl.PyLineShape_base_OnSize(*args, **kwargs) def base_OnMovePre(*args, **kwargs): """ - base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, + base_OnMovePre(self, DC dc, double x, double y, double old_x, double old_y, bool display=True) -> bool """ return _ogl.PyLineShape_base_OnMovePre(*args, **kwargs) def base_OnMovePost(*args, **kwargs): """ - base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, + base_OnMovePost(self, DC dc, double x, double y, double old_x, double old_y, bool display=True) """ return _ogl.PyLineShape_base_OnMovePost(*args, **kwargs) def base_OnDragLeft(*args, **kwargs): - """base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)""" + """base_OnDragLeft(self, bool draw, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyLineShape_base_OnDragLeft(*args, **kwargs) def base_OnBeginDragLeft(*args, **kwargs): - """base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)""" + """base_OnBeginDragLeft(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyLineShape_base_OnBeginDragLeft(*args, **kwargs) def base_OnEndDragLeft(*args, **kwargs): - """base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)""" + """base_OnEndDragLeft(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyLineShape_base_OnEndDragLeft(*args, **kwargs) def base_OnDragRight(*args, **kwargs): - """base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)""" + """base_OnDragRight(self, bool draw, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyLineShape_base_OnDragRight(*args, **kwargs) def base_OnBeginDragRight(*args, **kwargs): - """base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)""" + """base_OnBeginDragRight(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyLineShape_base_OnBeginDragRight(*args, **kwargs) def base_OnEndDragRight(*args, **kwargs): - """base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)""" + """base_OnEndDragRight(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyLineShape_base_OnEndDragRight(*args, **kwargs) def base_OnDrawOutline(*args, **kwargs): - """base_OnDrawOutline(DC dc, double x, double y, double w, double h)""" + """base_OnDrawOutline(self, DC dc, double x, double y, double w, double h)""" return _ogl.PyLineShape_base_OnDrawOutline(*args, **kwargs) def base_OnDrawControlPoints(*args, **kwargs): - """base_OnDrawControlPoints(DC dc)""" + """base_OnDrawControlPoints(self, DC dc)""" return _ogl.PyLineShape_base_OnDrawControlPoints(*args, **kwargs) def base_OnEraseControlPoints(*args, **kwargs): - """base_OnEraseControlPoints(DC dc)""" + """base_OnEraseControlPoints(self, DC dc)""" return _ogl.PyLineShape_base_OnEraseControlPoints(*args, **kwargs) def base_OnMoveLink(*args, **kwargs): - """base_OnMoveLink(DC dc, bool moveControlPoints=True)""" + """base_OnMoveLink(self, DC dc, bool moveControlPoints=True)""" return _ogl.PyLineShape_base_OnMoveLink(*args, **kwargs) def base_OnSizingDragLeft(*args, **kwargs): """ - base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, + base_OnSizingDragLeft(self, PyControlPoint pt, bool draw, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyLineShape_base_OnSizingDragLeft(*args, **kwargs) def base_OnSizingBeginDragLeft(*args, **kwargs): """ - base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, + base_OnSizingBeginDragLeft(self, PyControlPoint pt, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyLineShape_base_OnSizingBeginDragLeft(*args, **kwargs) def base_OnSizingEndDragLeft(*args, **kwargs): """ - base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, + base_OnSizingEndDragLeft(self, PyControlPoint pt, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyLineShape_base_OnSizingEndDragLeft(*args, **kwargs) def base_OnBeginSize(*args, **kwargs): - """base_OnBeginSize(double w, double h)""" + """base_OnBeginSize(self, double w, double h)""" return _ogl.PyLineShape_base_OnBeginSize(*args, **kwargs) def base_OnEndSize(*args, **kwargs): - """base_OnEndSize(double w, double h)""" + """base_OnEndSize(self, double w, double h)""" return _ogl.PyLineShape_base_OnEndSize(*args, **kwargs) @@ -3336,7 +3397,7 @@ class PyPolygonShape(PyShape): def __repr__(self): return "<%s.%s; proxy of C++ wxPyPolygonShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): - """__init__() -> PyPolygonShape""" + """__init__(self) -> PyPolygonShape""" newobj = _ogl.new_PyPolygonShape(*args, **kwargs) self.this = newobj.this self.thisown = 1 @@ -3344,158 +3405,178 @@ class PyPolygonShape(PyShape): self._setOORandCallbackInfo(PyPolygonShape) def _setCallbackInfo(*args, **kwargs): - """_setCallbackInfo(PyObject self, PyObject _class)""" + """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _ogl.PyPolygonShape__setCallbackInfo(*args, **kwargs) def Create(*args, **kwargs): - """Create(PyObject points) -> PyObject""" + """Create(self, PyObject points) -> PyObject""" return _ogl.PyPolygonShape_Create(*args, **kwargs) def AddPolygonPoint(*args, **kwargs): - """AddPolygonPoint(int pos=0)""" + """AddPolygonPoint(self, int pos=0)""" return _ogl.PyPolygonShape_AddPolygonPoint(*args, **kwargs) def CalculatePolygonCentre(*args, **kwargs): - """CalculatePolygonCentre()""" + """CalculatePolygonCentre(self)""" return _ogl.PyPolygonShape_CalculatePolygonCentre(*args, **kwargs) def DeletePolygonPoint(*args, **kwargs): - """DeletePolygonPoint(int pos=0)""" + """DeletePolygonPoint(self, int pos=0)""" return _ogl.PyPolygonShape_DeletePolygonPoint(*args, **kwargs) def GetPoints(*args, **kwargs): - """GetPoints() -> PyObject""" + """GetPoints(self) -> PyObject""" return _ogl.PyPolygonShape_GetPoints(*args, **kwargs) + def GetOriginalPoints(*args, **kwargs): + """GetOriginalPoints(self) -> PyObject""" + return _ogl.PyPolygonShape_GetOriginalPoints(*args, **kwargs) + + def GetOriginalWidth(*args, **kwargs): + """GetOriginalWidth(self) -> double""" + return _ogl.PyPolygonShape_GetOriginalWidth(*args, **kwargs) + + def GetOriginalHeight(*args, **kwargs): + """GetOriginalHeight(self) -> double""" + return _ogl.PyPolygonShape_GetOriginalHeight(*args, **kwargs) + + def SetOriginalWidth(*args, **kwargs): + """SetOriginalWidth(self, double w)""" + return _ogl.PyPolygonShape_SetOriginalWidth(*args, **kwargs) + + def SetOriginalHeight(*args, **kwargs): + """SetOriginalHeight(self, double h)""" + return _ogl.PyPolygonShape_SetOriginalHeight(*args, **kwargs) + def UpdateOriginalPoints(*args, **kwargs): - """UpdateOriginalPoints()""" + """UpdateOriginalPoints(self)""" return _ogl.PyPolygonShape_UpdateOriginalPoints(*args, **kwargs) def base_OnDraw(*args, **kwargs): - """base_OnDraw(DC dc)""" + """base_OnDraw(self, DC dc)""" return _ogl.PyPolygonShape_base_OnDraw(*args, **kwargs) def base_OnDrawContents(*args, **kwargs): - """base_OnDrawContents(DC dc)""" + """base_OnDrawContents(self, DC dc)""" return _ogl.PyPolygonShape_base_OnDrawContents(*args, **kwargs) def base_OnDrawBranches(*args, **kwargs): - """base_OnDrawBranches(DC dc, bool erase=FALSE)""" + """base_OnDrawBranches(self, DC dc, bool erase=FALSE)""" return _ogl.PyPolygonShape_base_OnDrawBranches(*args, **kwargs) def base_OnMoveLinks(*args, **kwargs): - """base_OnMoveLinks(DC dc)""" + """base_OnMoveLinks(self, DC dc)""" return _ogl.PyPolygonShape_base_OnMoveLinks(*args, **kwargs) def base_OnErase(*args, **kwargs): - """base_OnErase(DC dc)""" + """base_OnErase(self, DC dc)""" return _ogl.PyPolygonShape_base_OnErase(*args, **kwargs) def base_OnEraseContents(*args, **kwargs): - """base_OnEraseContents(DC dc)""" + """base_OnEraseContents(self, DC dc)""" return _ogl.PyPolygonShape_base_OnEraseContents(*args, **kwargs) def base_OnHighlight(*args, **kwargs): - """base_OnHighlight(DC dc)""" + """base_OnHighlight(self, DC dc)""" return _ogl.PyPolygonShape_base_OnHighlight(*args, **kwargs) def base_OnLeftClick(*args, **kwargs): - """base_OnLeftClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnLeftClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyPolygonShape_base_OnLeftClick(*args, **kwargs) def base_OnLeftDoubleClick(*args, **kwargs): - """base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnLeftDoubleClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyPolygonShape_base_OnLeftDoubleClick(*args, **kwargs) def base_OnRightClick(*args, **kwargs): - """base_OnRightClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnRightClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyPolygonShape_base_OnRightClick(*args, **kwargs) def base_OnSize(*args, **kwargs): - """base_OnSize(double x, double y)""" + """base_OnSize(self, double x, double y)""" return _ogl.PyPolygonShape_base_OnSize(*args, **kwargs) def base_OnMovePre(*args, **kwargs): """ - base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, + base_OnMovePre(self, DC dc, double x, double y, double old_x, double old_y, bool display=True) -> bool """ return _ogl.PyPolygonShape_base_OnMovePre(*args, **kwargs) def base_OnMovePost(*args, **kwargs): """ - base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, + base_OnMovePost(self, DC dc, double x, double y, double old_x, double old_y, bool display=True) """ return _ogl.PyPolygonShape_base_OnMovePost(*args, **kwargs) def base_OnDragLeft(*args, **kwargs): - """base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)""" + """base_OnDragLeft(self, bool draw, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyPolygonShape_base_OnDragLeft(*args, **kwargs) def base_OnBeginDragLeft(*args, **kwargs): - """base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)""" + """base_OnBeginDragLeft(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyPolygonShape_base_OnBeginDragLeft(*args, **kwargs) def base_OnEndDragLeft(*args, **kwargs): - """base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)""" + """base_OnEndDragLeft(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyPolygonShape_base_OnEndDragLeft(*args, **kwargs) def base_OnDragRight(*args, **kwargs): - """base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)""" + """base_OnDragRight(self, bool draw, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyPolygonShape_base_OnDragRight(*args, **kwargs) def base_OnBeginDragRight(*args, **kwargs): - """base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)""" + """base_OnBeginDragRight(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyPolygonShape_base_OnBeginDragRight(*args, **kwargs) def base_OnEndDragRight(*args, **kwargs): - """base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)""" + """base_OnEndDragRight(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyPolygonShape_base_OnEndDragRight(*args, **kwargs) def base_OnDrawOutline(*args, **kwargs): - """base_OnDrawOutline(DC dc, double x, double y, double w, double h)""" + """base_OnDrawOutline(self, DC dc, double x, double y, double w, double h)""" return _ogl.PyPolygonShape_base_OnDrawOutline(*args, **kwargs) def base_OnDrawControlPoints(*args, **kwargs): - """base_OnDrawControlPoints(DC dc)""" + """base_OnDrawControlPoints(self, DC dc)""" return _ogl.PyPolygonShape_base_OnDrawControlPoints(*args, **kwargs) def base_OnEraseControlPoints(*args, **kwargs): - """base_OnEraseControlPoints(DC dc)""" + """base_OnEraseControlPoints(self, DC dc)""" return _ogl.PyPolygonShape_base_OnEraseControlPoints(*args, **kwargs) def base_OnMoveLink(*args, **kwargs): - """base_OnMoveLink(DC dc, bool moveControlPoints=True)""" + """base_OnMoveLink(self, DC dc, bool moveControlPoints=True)""" return _ogl.PyPolygonShape_base_OnMoveLink(*args, **kwargs) def base_OnSizingDragLeft(*args, **kwargs): """ - base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, + base_OnSizingDragLeft(self, PyControlPoint pt, bool draw, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyPolygonShape_base_OnSizingDragLeft(*args, **kwargs) def base_OnSizingBeginDragLeft(*args, **kwargs): """ - base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, + base_OnSizingBeginDragLeft(self, PyControlPoint pt, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyPolygonShape_base_OnSizingBeginDragLeft(*args, **kwargs) def base_OnSizingEndDragLeft(*args, **kwargs): """ - base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, + base_OnSizingEndDragLeft(self, PyControlPoint pt, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyPolygonShape_base_OnSizingEndDragLeft(*args, **kwargs) def base_OnBeginSize(*args, **kwargs): - """base_OnBeginSize(double w, double h)""" + """base_OnBeginSize(self, double w, double h)""" return _ogl.PyPolygonShape_base_OnBeginSize(*args, **kwargs) def base_OnEndSize(*args, **kwargs): - """base_OnEndSize(double w, double h)""" + """base_OnEndSize(self, double w, double h)""" return _ogl.PyPolygonShape_base_OnEndSize(*args, **kwargs) @@ -3510,7 +3591,7 @@ class PyTextShape(PyRectangleShape): def __repr__(self): return "<%s.%s; proxy of C++ wxPyTextShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): - """__init__(double width=0.0, double height=0.0) -> PyTextShape""" + """__init__(self, double width=0.0, double height=0.0) -> PyTextShape""" newobj = _ogl.new_PyTextShape(*args, **kwargs) self.this = newobj.this self.thisown = 1 @@ -3518,138 +3599,138 @@ class PyTextShape(PyRectangleShape): self._setOORandCallbackInfo(PyTextShape) def _setCallbackInfo(*args, **kwargs): - """_setCallbackInfo(PyObject self, PyObject _class)""" + """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _ogl.PyTextShape__setCallbackInfo(*args, **kwargs) def base_OnDelete(*args, **kwargs): - """base_OnDelete()""" + """base_OnDelete(self)""" return _ogl.PyTextShape_base_OnDelete(*args, **kwargs) def base_OnDraw(*args, **kwargs): - """base_OnDraw(DC dc)""" + """base_OnDraw(self, DC dc)""" return _ogl.PyTextShape_base_OnDraw(*args, **kwargs) def base_OnDrawContents(*args, **kwargs): - """base_OnDrawContents(DC dc)""" + """base_OnDrawContents(self, DC dc)""" return _ogl.PyTextShape_base_OnDrawContents(*args, **kwargs) def base_OnDrawBranches(*args, **kwargs): - """base_OnDrawBranches(DC dc, bool erase=FALSE)""" + """base_OnDrawBranches(self, DC dc, bool erase=FALSE)""" return _ogl.PyTextShape_base_OnDrawBranches(*args, **kwargs) def base_OnMoveLinks(*args, **kwargs): - """base_OnMoveLinks(DC dc)""" + """base_OnMoveLinks(self, DC dc)""" return _ogl.PyTextShape_base_OnMoveLinks(*args, **kwargs) def base_OnErase(*args, **kwargs): - """base_OnErase(DC dc)""" + """base_OnErase(self, DC dc)""" return _ogl.PyTextShape_base_OnErase(*args, **kwargs) def base_OnEraseContents(*args, **kwargs): - """base_OnEraseContents(DC dc)""" + """base_OnEraseContents(self, DC dc)""" return _ogl.PyTextShape_base_OnEraseContents(*args, **kwargs) def base_OnHighlight(*args, **kwargs): - """base_OnHighlight(DC dc)""" + """base_OnHighlight(self, DC dc)""" return _ogl.PyTextShape_base_OnHighlight(*args, **kwargs) def base_OnLeftClick(*args, **kwargs): - """base_OnLeftClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnLeftClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyTextShape_base_OnLeftClick(*args, **kwargs) def base_OnLeftDoubleClick(*args, **kwargs): - """base_OnLeftDoubleClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnLeftDoubleClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyTextShape_base_OnLeftDoubleClick(*args, **kwargs) def base_OnRightClick(*args, **kwargs): - """base_OnRightClick(double x, double y, int keys=0, int attachment=0)""" + """base_OnRightClick(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyTextShape_base_OnRightClick(*args, **kwargs) def base_OnSize(*args, **kwargs): - """base_OnSize(double x, double y)""" + """base_OnSize(self, double x, double y)""" return _ogl.PyTextShape_base_OnSize(*args, **kwargs) def base_OnMovePre(*args, **kwargs): """ - base_OnMovePre(DC dc, double x, double y, double old_x, double old_y, + base_OnMovePre(self, DC dc, double x, double y, double old_x, double old_y, bool display=True) -> bool """ return _ogl.PyTextShape_base_OnMovePre(*args, **kwargs) def base_OnMovePost(*args, **kwargs): """ - base_OnMovePost(DC dc, double x, double y, double old_x, double old_y, + base_OnMovePost(self, DC dc, double x, double y, double old_x, double old_y, bool display=True) """ return _ogl.PyTextShape_base_OnMovePost(*args, **kwargs) def base_OnDragLeft(*args, **kwargs): - """base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment=0)""" + """base_OnDragLeft(self, bool draw, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyTextShape_base_OnDragLeft(*args, **kwargs) def base_OnBeginDragLeft(*args, **kwargs): - """base_OnBeginDragLeft(double x, double y, int keys=0, int attachment=0)""" + """base_OnBeginDragLeft(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyTextShape_base_OnBeginDragLeft(*args, **kwargs) def base_OnEndDragLeft(*args, **kwargs): - """base_OnEndDragLeft(double x, double y, int keys=0, int attachment=0)""" + """base_OnEndDragLeft(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyTextShape_base_OnEndDragLeft(*args, **kwargs) def base_OnDragRight(*args, **kwargs): - """base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment=0)""" + """base_OnDragRight(self, bool draw, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyTextShape_base_OnDragRight(*args, **kwargs) def base_OnBeginDragRight(*args, **kwargs): - """base_OnBeginDragRight(double x, double y, int keys=0, int attachment=0)""" + """base_OnBeginDragRight(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyTextShape_base_OnBeginDragRight(*args, **kwargs) def base_OnEndDragRight(*args, **kwargs): - """base_OnEndDragRight(double x, double y, int keys=0, int attachment=0)""" + """base_OnEndDragRight(self, double x, double y, int keys=0, int attachment=0)""" return _ogl.PyTextShape_base_OnEndDragRight(*args, **kwargs) def base_OnDrawOutline(*args, **kwargs): - """base_OnDrawOutline(DC dc, double x, double y, double w, double h)""" + """base_OnDrawOutline(self, DC dc, double x, double y, double w, double h)""" return _ogl.PyTextShape_base_OnDrawOutline(*args, **kwargs) def base_OnDrawControlPoints(*args, **kwargs): - """base_OnDrawControlPoints(DC dc)""" + """base_OnDrawControlPoints(self, DC dc)""" return _ogl.PyTextShape_base_OnDrawControlPoints(*args, **kwargs) def base_OnEraseControlPoints(*args, **kwargs): - """base_OnEraseControlPoints(DC dc)""" + """base_OnEraseControlPoints(self, DC dc)""" return _ogl.PyTextShape_base_OnEraseControlPoints(*args, **kwargs) def base_OnMoveLink(*args, **kwargs): - """base_OnMoveLink(DC dc, bool moveControlPoints=True)""" + """base_OnMoveLink(self, DC dc, bool moveControlPoints=True)""" return _ogl.PyTextShape_base_OnMoveLink(*args, **kwargs) def base_OnSizingDragLeft(*args, **kwargs): """ - base_OnSizingDragLeft(PyControlPoint pt, bool draw, double x, double y, int keys=0, + base_OnSizingDragLeft(self, PyControlPoint pt, bool draw, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyTextShape_base_OnSizingDragLeft(*args, **kwargs) def base_OnSizingBeginDragLeft(*args, **kwargs): """ - base_OnSizingBeginDragLeft(PyControlPoint pt, double x, double y, int keys=0, + base_OnSizingBeginDragLeft(self, PyControlPoint pt, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyTextShape_base_OnSizingBeginDragLeft(*args, **kwargs) def base_OnSizingEndDragLeft(*args, **kwargs): """ - base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, + base_OnSizingEndDragLeft(self, PyControlPoint pt, double x, double y, int keys=0, int attachment=0) """ return _ogl.PyTextShape_base_OnSizingEndDragLeft(*args, **kwargs) def base_OnBeginSize(*args, **kwargs): - """base_OnBeginSize(double w, double h)""" + """base_OnBeginSize(self, double w, double h)""" return _ogl.PyTextShape_base_OnBeginSize(*args, **kwargs) def base_OnEndSize(*args, **kwargs): - """base_OnEndSize(double w, double h)""" + """base_OnEndSize(self, double w, double h)""" return _ogl.PyTextShape_base_OnEndSize(*args, **kwargs) @@ -3660,109 +3741,109 @@ class PyTextShapePtr(PyTextShape): self.__class__ = PyTextShape _ogl.PyTextShape_swigregister(PyTextShapePtr) -class Diagram(core.Object): +class Diagram(_core.Object): def __repr__(self): return "<%s.%s; proxy of C++ wxDiagram instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): - """__init__() -> Diagram""" + """__init__(self) -> Diagram""" newobj = _ogl.new_Diagram(*args, **kwargs) self.this = newobj.this self.thisown = 1 del newobj.thisown def AddShape(*args, **kwargs): - """AddShape(PyShape shape, PyShape addAfter=None)""" + """AddShape(self, PyShape shape, PyShape addAfter=None)""" return _ogl.Diagram_AddShape(*args, **kwargs) def Clear(*args, **kwargs): - """Clear(DC dc)""" + """Clear(self, DC dc)""" return _ogl.Diagram_Clear(*args, **kwargs) def DeleteAllShapes(*args, **kwargs): - """DeleteAllShapes()""" + """DeleteAllShapes(self)""" return _ogl.Diagram_DeleteAllShapes(*args, **kwargs) def DrawOutline(*args, **kwargs): - """DrawOutline(DC dc, double x1, double y1, double x2, double y2)""" + """DrawOutline(self, DC dc, double x1, double y1, double x2, double y2)""" return _ogl.Diagram_DrawOutline(*args, **kwargs) def FindShape(*args, **kwargs): - """FindShape(long id) -> PyShape""" + """FindShape(self, long id) -> PyShape""" return _ogl.Diagram_FindShape(*args, **kwargs) def GetCanvas(*args, **kwargs): - """GetCanvas() -> PyShapeCanvas""" + """GetCanvas(self) -> PyShapeCanvas""" return _ogl.Diagram_GetCanvas(*args, **kwargs) def GetCount(*args, **kwargs): - """GetCount() -> int""" + """GetCount(self) -> int""" return _ogl.Diagram_GetCount(*args, **kwargs) def GetGridSpacing(*args, **kwargs): - """GetGridSpacing() -> double""" + """GetGridSpacing(self) -> double""" return _ogl.Diagram_GetGridSpacing(*args, **kwargs) def GetMouseTolerance(*args, **kwargs): - """GetMouseTolerance() -> int""" + """GetMouseTolerance(self) -> int""" return _ogl.Diagram_GetMouseTolerance(*args, **kwargs) def GetShapeList(*args, **kwargs): - """GetShapeList() -> PyObject""" + """GetShapeList(self) -> PyObject""" return _ogl.Diagram_GetShapeList(*args, **kwargs) def GetQuickEditMode(*args, **kwargs): - """GetQuickEditMode() -> bool""" + """GetQuickEditMode(self) -> bool""" return _ogl.Diagram_GetQuickEditMode(*args, **kwargs) def GetSnapToGrid(*args, **kwargs): - """GetSnapToGrid() -> bool""" + """GetSnapToGrid(self) -> bool""" return _ogl.Diagram_GetSnapToGrid(*args, **kwargs) def InsertShape(*args, **kwargs): - """InsertShape(PyShape shape)""" + """InsertShape(self, PyShape shape)""" return _ogl.Diagram_InsertShape(*args, **kwargs) def RecentreAll(*args, **kwargs): - """RecentreAll(DC dc)""" + """RecentreAll(self, DC dc)""" return _ogl.Diagram_RecentreAll(*args, **kwargs) def Redraw(*args, **kwargs): - """Redraw(DC dc)""" + """Redraw(self, DC dc)""" return _ogl.Diagram_Redraw(*args, **kwargs) def RemoveAllShapes(*args, **kwargs): - """RemoveAllShapes()""" + """RemoveAllShapes(self)""" return _ogl.Diagram_RemoveAllShapes(*args, **kwargs) def RemoveShape(*args, **kwargs): - """RemoveShape(PyShape shape)""" + """RemoveShape(self, PyShape shape)""" return _ogl.Diagram_RemoveShape(*args, **kwargs) def SetCanvas(*args, **kwargs): - """SetCanvas(PyShapeCanvas canvas)""" + """SetCanvas(self, PyShapeCanvas canvas)""" return _ogl.Diagram_SetCanvas(*args, **kwargs) def SetGridSpacing(*args, **kwargs): - """SetGridSpacing(double spacing)""" + """SetGridSpacing(self, double spacing)""" return _ogl.Diagram_SetGridSpacing(*args, **kwargs) def SetMouseTolerance(*args, **kwargs): - """SetMouseTolerance(int tolerance)""" + """SetMouseTolerance(self, int tolerance)""" return _ogl.Diagram_SetMouseTolerance(*args, **kwargs) def SetQuickEditMode(*args, **kwargs): - """SetQuickEditMode(bool mode)""" + """SetQuickEditMode(self, bool mode)""" return _ogl.Diagram_SetQuickEditMode(*args, **kwargs) def SetSnapToGrid(*args, **kwargs): - """SetSnapToGrid(bool snap)""" + """SetSnapToGrid(self, bool snap)""" return _ogl.Diagram_SetSnapToGrid(*args, **kwargs) def ShowAll(*args, **kwargs): - """ShowAll(bool show)""" + """ShowAll(self, bool show)""" return _ogl.Diagram_ShowAll(*args, **kwargs) def Snap(*args, **kwargs): - """Snap(double INOUT, double INOUT)""" + """Snap(self, double INOUT, double INOUT)""" return _ogl.Diagram_Snap(*args, **kwargs) @@ -3773,12 +3854,12 @@ class DiagramPtr(Diagram): self.__class__ = Diagram _ogl.Diagram_swigregister(DiagramPtr) -class PyShapeCanvas(windows.ScrolledWindow): +class PyShapeCanvas(_windows.ScrolledWindow): def __repr__(self): return "<%s.%s; proxy of C++ wxPyShapeCanvas instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): """ - __init__(Window parent=None, int id=-1, Point pos=DefaultPosition, + __init__(self, Window parent=None, int id=-1, Point pos=DefaultPosition, Size size=DefaultSize, long style=BORDER, String name=wxPyShapeCanvasNameStr) -> PyShapeCanvas """ @@ -3787,7 +3868,7 @@ class PyShapeCanvas(windows.ScrolledWindow): self.thisown = 1 del newobj.thisown def _setCallbackInfo(*args, **kwargs): - """_setCallbackInfo(PyObject self, PyObject _class)""" + """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _ogl.PyShapeCanvas__setCallbackInfo(*args, **kwargs) def _setOORandCallbackInfo(self, _class): @@ -3795,78 +3876,78 @@ class PyShapeCanvas(windows.ScrolledWindow): self._setCallbackInfo(self, _class) def AddShape(*args, **kwargs): - """AddShape(PyShape shape, PyShape addAfter=None)""" + """AddShape(self, PyShape shape, PyShape addAfter=None)""" return _ogl.PyShapeCanvas_AddShape(*args, **kwargs) def FindShape(*args, **kwargs): """ - FindShape(double x1, double y, int OUTPUT, wxClassInfo info=None, + FindShape(self, double x1, double y, int OUTPUT, wxClassInfo info=None, PyShape notImage=None) -> PyShape """ return _ogl.PyShapeCanvas_FindShape(*args, **kwargs) def FindFirstSensitiveShape(*args, **kwargs): - """FindFirstSensitiveShape(double x1, double y, int OUTPUT, int op) -> PyShape""" + """FindFirstSensitiveShape(self, double x1, double y, int OUTPUT, int op) -> PyShape""" return _ogl.PyShapeCanvas_FindFirstSensitiveShape(*args, **kwargs) def GetDiagram(*args, **kwargs): - """GetDiagram() -> Diagram""" + """GetDiagram(self) -> Diagram""" return _ogl.PyShapeCanvas_GetDiagram(*args, **kwargs) def GetQuickEditMode(*args, **kwargs): - """GetQuickEditMode() -> bool""" + """GetQuickEditMode(self) -> bool""" return _ogl.PyShapeCanvas_GetQuickEditMode(*args, **kwargs) def InsertShape(*args, **kwargs): - """InsertShape(PyShape shape)""" + """InsertShape(self, PyShape shape)""" return _ogl.PyShapeCanvas_InsertShape(*args, **kwargs) def base_OnBeginDragLeft(*args, **kwargs): - """base_OnBeginDragLeft(double x, double y, int keys=0)""" + """base_OnBeginDragLeft(self, double x, double y, int keys=0)""" return _ogl.PyShapeCanvas_base_OnBeginDragLeft(*args, **kwargs) def base_OnBeginDragRight(*args, **kwargs): - """base_OnBeginDragRight(double x, double y, int keys=0)""" + """base_OnBeginDragRight(self, double x, double y, int keys=0)""" return _ogl.PyShapeCanvas_base_OnBeginDragRight(*args, **kwargs) def base_OnEndDragLeft(*args, **kwargs): - """base_OnEndDragLeft(double x, double y, int keys=0)""" + """base_OnEndDragLeft(self, double x, double y, int keys=0)""" return _ogl.PyShapeCanvas_base_OnEndDragLeft(*args, **kwargs) def base_OnEndDragRight(*args, **kwargs): - """base_OnEndDragRight(double x, double y, int keys=0)""" + """base_OnEndDragRight(self, double x, double y, int keys=0)""" return _ogl.PyShapeCanvas_base_OnEndDragRight(*args, **kwargs) def base_OnDragLeft(*args, **kwargs): - """base_OnDragLeft(bool draw, double x, double y, int keys=0)""" + """base_OnDragLeft(self, bool draw, double x, double y, int keys=0)""" return _ogl.PyShapeCanvas_base_OnDragLeft(*args, **kwargs) def base_OnDragRight(*args, **kwargs): - """base_OnDragRight(bool draw, double x, double y, int keys=0)""" + """base_OnDragRight(self, bool draw, double x, double y, int keys=0)""" return _ogl.PyShapeCanvas_base_OnDragRight(*args, **kwargs) def base_OnLeftClick(*args, **kwargs): - """base_OnLeftClick(double x, double y, int keys=0)""" + """base_OnLeftClick(self, double x, double y, int keys=0)""" return _ogl.PyShapeCanvas_base_OnLeftClick(*args, **kwargs) def base_OnRightClick(*args, **kwargs): - """base_OnRightClick(double x, double y, int keys=0)""" + """base_OnRightClick(self, double x, double y, int keys=0)""" return _ogl.PyShapeCanvas_base_OnRightClick(*args, **kwargs) def Redraw(*args, **kwargs): - """Redraw(DC dc)""" + """Redraw(self, DC dc)""" return _ogl.PyShapeCanvas_Redraw(*args, **kwargs) def RemoveShape(*args, **kwargs): - """RemoveShape(PyShape shape)""" + """RemoveShape(self, PyShape shape)""" return _ogl.PyShapeCanvas_RemoveShape(*args, **kwargs) def SetDiagram(*args, **kwargs): - """SetDiagram(Diagram diagram)""" + """SetDiagram(self, Diagram diagram)""" return _ogl.PyShapeCanvas_SetDiagram(*args, **kwargs) def Snap(*args, **kwargs): - """Snap(double INOUT, double INOUT)""" + """Snap(self, double INOUT, double INOUT)""" return _ogl.PyShapeCanvas_Snap(*args, **kwargs) def GetShapeList(self):