]> git.saurik.com Git - wxWidgets.git/blobdiff - wxPython/contrib/ogl/msw/ogl.py
embedded sample's README updates
[wxWidgets.git] / wxPython / contrib / ogl / msw / ogl.py
index 750f38a0df56221ab7461f85d597c06e67aec926..19aee91fb703db61d45b19a12ce4a9832746d614 100644 (file)
@@ -9,7 +9,6 @@ wx = core
 #---------------------------------------------------------------------------
 
 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):
@@ -19,11 +18,11 @@ class ShapeRegion(core.Object):
         self.thisown = 1
         del newobj.thisown
     def SetText(*args, **kwargs):
-        """SetText(wxString s)"""
+        """SetText(String s)"""
         return _ogl.ShapeRegion_SetText(*args, **kwargs)
 
     def SetFont(*args, **kwargs):
-        """SetFont(wxFont f)"""
+        """SetFont(Font f)"""
         return _ogl.ShapeRegion_SetFont(*args, **kwargs)
 
     def SetMinSize(*args, **kwargs):
@@ -47,19 +46,19 @@ class ShapeRegion(core.Object):
         return _ogl.ShapeRegion_SetFormatMode(*args, **kwargs)
 
     def SetName(*args, **kwargs):
-        """SetName(wxString s)"""
+        """SetName(String s)"""
         return _ogl.ShapeRegion_SetName(*args, **kwargs)
 
     def SetColour(*args, **kwargs):
-        """SetColour(wxString col)"""
+        """SetColour(String col)"""
         return _ogl.ShapeRegion_SetColour(*args, **kwargs)
 
     def GetText(*args, **kwargs):
-        """GetText() -> wxString"""
+        """GetText() -> String"""
         return _ogl.ShapeRegion_GetText(*args, **kwargs)
 
     def GetFont(*args, **kwargs):
-        """GetFont() -> wxFont"""
+        """GetFont() -> Font"""
         return _ogl.ShapeRegion_GetFont(*args, **kwargs)
 
     def GetMinSize(*args, **kwargs):
@@ -83,15 +82,15 @@ class ShapeRegion(core.Object):
         return _ogl.ShapeRegion_GetFormatMode(*args, **kwargs)
 
     def GetName(*args, **kwargs):
-        """GetName() -> wxString"""
+        """GetName() -> String"""
         return _ogl.ShapeRegion_GetName(*args, **kwargs)
 
     def GetColour(*args, **kwargs):
-        """GetColour() -> wxString"""
+        """GetColour() -> String"""
         return _ogl.ShapeRegion_GetColour(*args, **kwargs)
 
     def GetActualColourObject(*args, **kwargs):
-        """GetActualColourObject() -> wxColour"""
+        """GetActualColourObject() -> Colour"""
         return _ogl.ShapeRegion_GetActualColourObject(*args, **kwargs)
 
     def GetFormattedText(*args, **kwargs):
@@ -99,7 +98,7 @@ class ShapeRegion(core.Object):
         return _ogl.ShapeRegion_GetFormattedText(*args, **kwargs)
 
     def GetPenColour(*args, **kwargs):
-        """GetPenColour() -> wxString"""
+        """GetPenColour() -> String"""
         return _ogl.ShapeRegion_GetPenColour(*args, **kwargs)
 
     def GetPenStyle(*args, **kwargs):
@@ -111,7 +110,7 @@ class ShapeRegion(core.Object):
         return _ogl.ShapeRegion_SetPenStyle(*args, **kwargs)
 
     def SetPenColour(*args, **kwargs):
-        """SetPenColour(wxString col)"""
+        """SetPenColour(String col)"""
         return _ogl.ShapeRegion_SetPenColour(*args, **kwargs)
 
     def GetActualPen(*args, **kwargs):
@@ -138,8 +137,27 @@ class ShapeRegionPtr(ShapeRegion):
         self.__class__ = ShapeRegion
 _ogl.ShapeRegion_swigregister(ShapeRegionPtr)
 
+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__(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):
@@ -187,31 +205,31 @@ class PyShapeEvtHandler(core.Object):
         return _ogl.PyShapeEvtHandler_base_OnDelete(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):
-        """base_OnDraw(wxDC dc)"""
+        """base_OnDraw(DC dc)"""
         return _ogl.PyShapeEvtHandler_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):
-        """base_OnDrawContents(wxDC dc)"""
+        """base_OnDrawContents(DC dc)"""
         return _ogl.PyShapeEvtHandler_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):
-        """base_OnDrawBranches(wxDC dc, bool erase=False)"""
+        """base_OnDrawBranches(DC dc, bool erase=False)"""
         return _ogl.PyShapeEvtHandler_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):
-        """base_OnMoveLinks(wxDC dc)"""
+        """base_OnMoveLinks(DC dc)"""
         return _ogl.PyShapeEvtHandler_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):
-        """base_OnErase(wxDC dc)"""
+        """base_OnErase(DC dc)"""
         return _ogl.PyShapeEvtHandler_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):
-        """base_OnEraseContents(wxDC dc)"""
+        """base_OnEraseContents(DC dc)"""
         return _ogl.PyShapeEvtHandler_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):
-        """base_OnHighlight(wxDC dc)"""
+        """base_OnHighlight(DC dc)"""
         return _ogl.PyShapeEvtHandler_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):
@@ -231,13 +249,17 @@ class PyShapeEvtHandler(core.Object):
         return _ogl.PyShapeEvtHandler_base_OnSize(*args, **kwargs)
 
     def base_OnMovePre(*args, **kwargs):
-        """base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
-    bool display=True) -> bool"""
+        """
+        base_OnMovePre(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(wxDC dc, double x, double y, double old_x, double old_y, 
-    bool display=True)"""
+        """
+        base_OnMovePost(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):
@@ -265,34 +287,40 @@ class PyShapeEvtHandler(core.Object):
         return _ogl.PyShapeEvtHandler_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):
-        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        """base_OnDrawOutline(DC dc, double x, double y, double w, double h)"""
         return _ogl.PyShapeEvtHandler_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):
-        """base_OnDrawControlPoints(wxDC dc)"""
+        """base_OnDrawControlPoints(DC dc)"""
         return _ogl.PyShapeEvtHandler_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):
-        """base_OnEraseControlPoints(wxDC dc)"""
+        """base_OnEraseControlPoints(DC dc)"""
         return _ogl.PyShapeEvtHandler_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):
-        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        """base_OnMoveLink(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingDragLeft(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingBeginDragLeft(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+            int attachment=0)
+        """
         return _ogl.PyShapeEvtHandler_base_OnSizingEndDragLeft(*args, **kwargs)
 
     def base_OnBeginSize(*args, **kwargs):
@@ -312,7 +340,6 @@ class PyShapeEvtHandlerPtr(PyShapeEvtHandler):
 _ogl.PyShapeEvtHandler_swigregister(PyShapeEvtHandlerPtr)
 
 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):
@@ -336,8 +363,10 @@ class PyShape(PyShapeEvtHandler):
         return _ogl.PyShape_GetBoundingBoxMin(*args, **kwargs)
 
     def GetPerimeterPoint(*args, **kwargs):
-        """GetPerimeterPoint(double x1, double y1, double x2, double y2, double OUTPUT, 
-    double OUTPUT) -> bool"""
+        """
+        GetPerimeterPoint(double x1, double y1, double x2, double y2, double OUTPUT, 
+            double OUTPUT) -> bool
+        """
         return _ogl.PyShape_GetPerimeterPoint(*args, **kwargs)
 
     def GetCanvas(*args, **kwargs):
@@ -409,7 +438,7 @@ class PyShape(PyShapeEvtHandler):
         return _ogl.PyShape_MakeControlPoints(*args, **kwargs)
 
     def DeleteControlPoints(*args, **kwargs):
-        """DeleteControlPoints(wxDC dc=None)"""
+        """DeleteControlPoints(DC dc=None)"""
         return _ogl.PyShape_DeleteControlPoints(*args, **kwargs)
 
     def ResetControlPoints(*args, **kwargs):
@@ -441,7 +470,7 @@ class PyShape(PyShapeEvtHandler):
         return _ogl.PyShape_CalculateSize(*args, **kwargs)
 
     def Select(*args, **kwargs):
-        """Select(bool select=True, wxDC dc=None)"""
+        """Select(bool select=True, DC dc=None)"""
         return _ogl.PyShape_Select(*args, **kwargs)
 
     def SetHighlight(*args, **kwargs):
@@ -577,19 +606,19 @@ class PyShape(PyShapeEvtHandler):
         return _ogl.PyShape_IsShown(*args, **kwargs)
 
     def Move(*args, **kwargs):
-        """Move(wxDC dc, double x1, double y1, bool display=True)"""
+        """Move(DC dc, double x1, double y1, bool display=True)"""
         return _ogl.PyShape_Move(*args, **kwargs)
 
     def Erase(*args, **kwargs):
-        """Erase(wxDC dc)"""
+        """Erase(DC dc)"""
         return _ogl.PyShape_Erase(*args, **kwargs)
 
     def EraseContents(*args, **kwargs):
-        """EraseContents(wxDC dc)"""
+        """EraseContents(DC dc)"""
         return _ogl.PyShape_EraseContents(*args, **kwargs)
 
     def Draw(*args, **kwargs):
-        """Draw(wxDC dc)"""
+        """Draw(DC dc)"""
         return _ogl.PyShape_Draw(*args, **kwargs)
 
     def Flash(*args, **kwargs):
@@ -597,11 +626,11 @@ class PyShape(PyShapeEvtHandler):
         return _ogl.PyShape_Flash(*args, **kwargs)
 
     def MoveLinks(*args, **kwargs):
-        """MoveLinks(wxDC dc)"""
+        """MoveLinks(DC dc)"""
         return _ogl.PyShape_MoveLinks(*args, **kwargs)
 
     def DrawContents(*args, **kwargs):
-        """DrawContents(wxDC dc)"""
+        """DrawContents(DC dc)"""
         return _ogl.PyShape_DrawContents(*args, **kwargs)
 
     def SetSize(*args, **kwargs):
@@ -625,8 +654,10 @@ class PyShape(PyShapeEvtHandler):
         return _ogl.PyShape_Constrain(*args, **kwargs)
 
     def AddLine(*args, **kwargs):
-        """AddLine(PyLineShape line, PyShape other, int attachFrom=0, 
-    int attachTo=0, int positionFrom=-1, int positionTo=-1)"""
+        """
+        AddLine(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):
@@ -634,7 +665,7 @@ class PyShape(PyShapeEvtHandler):
         return _ogl.PyShape_GetLinePosition(*args, **kwargs)
 
     def AddText(*args, **kwargs):
-        """AddText(wxString string)"""
+        """AddText(String string)"""
         return _ogl.PyShape_AddText(*args, **kwargs)
 
     def GetPen(*args, **kwargs):
@@ -650,7 +681,7 @@ class PyShape(PyShapeEvtHandler):
         return _ogl.PyShape_SetDefaultRegionSize(*args, **kwargs)
 
     def FormatText(*args, **kwargs):
-        """FormatText(wxDC dc, wxString s, int regionId=0)"""
+        """FormatText(DC dc, String s, int regionId=0)"""
         return _ogl.PyShape_FormatText(*args, **kwargs)
 
     def SetFormatMode(*args, **kwargs):
@@ -662,19 +693,19 @@ class PyShape(PyShapeEvtHandler):
         return _ogl.PyShape_GetFormatMode(*args, **kwargs)
 
     def SetFont(*args, **kwargs):
-        """SetFont(wxFont font, int regionId=0)"""
+        """SetFont(Font font, int regionId=0)"""
         return _ogl.PyShape_SetFont(*args, **kwargs)
 
     def GetFont(*args, **kwargs):
-        """GetFont(int regionId=0) -> wxFont"""
+        """GetFont(int regionId=0) -> Font"""
         return _ogl.PyShape_GetFont(*args, **kwargs)
 
     def SetTextColour(*args, **kwargs):
-        """SetTextColour(wxString colour, int regionId=0)"""
+        """SetTextColour(String colour, int regionId=0)"""
         return _ogl.PyShape_SetTextColour(*args, **kwargs)
 
     def GetTextColour(*args, **kwargs):
-        """GetTextColour(int regionId=0) -> wxString"""
+        """GetTextColour(int regionId=0) -> String"""
         return _ogl.PyShape_GetTextColour(*args, **kwargs)
 
     def GetNumberOfTextRegions(*args, **kwargs):
@@ -682,19 +713,19 @@ class PyShape(PyShapeEvtHandler):
         return _ogl.PyShape_GetNumberOfTextRegions(*args, **kwargs)
 
     def SetRegionName(*args, **kwargs):
-        """SetRegionName(wxString name, int regionId=0)"""
+        """SetRegionName(String name, int regionId=0)"""
         return _ogl.PyShape_SetRegionName(*args, **kwargs)
 
     def GetRegionName(*args, **kwargs):
-        """GetRegionName(int regionId) -> wxString"""
+        """GetRegionName(int regionId) -> String"""
         return _ogl.PyShape_GetRegionName(*args, **kwargs)
 
     def GetRegionId(*args, **kwargs):
-        """GetRegionId(wxString name) -> int"""
+        """GetRegionId(String name) -> int"""
         return _ogl.PyShape_GetRegionId(*args, **kwargs)
 
     def NameRegions(*args, **kwargs):
-        """NameRegions(wxString parentName="")"""
+        """NameRegions(String parentName=EmptyString)"""
         return _ogl.PyShape_NameRegions(*args, **kwargs)
 
     def GetRegions(*args, **kwargs):
@@ -714,7 +745,7 @@ class PyShape(PyShapeEvtHandler):
         return _ogl.PyShape_AssignNewIds(*args, **kwargs)
 
     def FindRegion(*args, **kwargs):
-        """FindRegion(wxString regionName, int OUTPUT) -> PyShape"""
+        """FindRegion(String regionName, int OUTPUT) -> PyShape"""
         return _ogl.PyShape_FindRegion(*args, **kwargs)
 
     def FindRegionNames(*args, **kwargs):
@@ -730,8 +761,10 @@ class PyShape(PyShapeEvtHandler):
         return _ogl.PyShape_RemoveLine(*args, **kwargs)
 
     def GetAttachmentPosition(*args, **kwargs):
-        """GetAttachmentPosition(int attachment, double OUTPUT, double OUTPUT, int nth=0, 
-    int no_arcs=1, PyLineShape line=None) -> bool"""
+        """
+        GetAttachmentPosition(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):
@@ -742,14 +775,22 @@ class PyShape(PyShapeEvtHandler):
         """AttachmentIsValid(int attachment) -> bool"""
         return _ogl.PyShape_AttachmentIsValid(*args, **kwargs)
 
+    def GetAttachments(*args, **kwargs):
+        """GetAttachments() -> PyObject"""
+        return _ogl.PyShape_GetAttachments(*args, **kwargs)
+
     def GetAttachmentPositionEdge(*args, **kwargs):
-        """GetAttachmentPositionEdge(int attachment, double OUTPUT, double OUTPUT, int nth=0, 
-    int no_arcs=1, PyLineShape line=None) -> bool"""
+        """
+        GetAttachmentPositionEdge(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, 
-    PyLineShape line) -> RealPoint"""
+        """
+        CalcSimpleAttachment(RealPoint pt1, RealPoint pt2, int nth, int noArcs, 
+            PyLineShape line) -> RealPoint
+        """
         return _ogl.PyShape_CalcSimpleAttachment(*args, **kwargs)
 
     def AttachmentSortTest(*args, **kwargs):
@@ -757,15 +798,15 @@ class PyShape(PyShapeEvtHandler):
         return _ogl.PyShape_AttachmentSortTest(*args, **kwargs)
 
     def EraseLinks(*args, **kwargs):
-        """EraseLinks(wxDC dc, int attachment=-1, bool recurse=False)"""
+        """EraseLinks(DC dc, int attachment=-1, bool recurse=False)"""
         return _ogl.PyShape_EraseLinks(*args, **kwargs)
 
     def DrawLinks(*args, **kwargs):
-        """DrawLinks(wxDC dc, int attachment=-1, bool recurse=False)"""
+        """DrawLinks(DC dc, int attachment=-1, bool recurse=False)"""
         return _ogl.PyShape_DrawLinks(*args, **kwargs)
 
     def MoveLineToNewAttachment(*args, **kwargs):
-        """MoveLineToNewAttachment(wxDC dc, PyLineShape to_move, double x, double y) -> bool"""
+        """MoveLineToNewAttachment(DC dc, PyLineShape to_move, double x, double y) -> bool"""
         return _ogl.PyShape_MoveLineToNewAttachment(*args, **kwargs)
 
     def ApplyAttachmentOrdering(*args, **kwargs):
@@ -777,8 +818,10 @@ class PyShape(PyShapeEvtHandler):
         return _ogl.PyShape_GetBranchingAttachmentRoot(*args, **kwargs)
 
     def GetBranchingAttachmentInfo(*args, **kwargs):
-        """GetBranchingAttachmentInfo(int attachment, RealPoint root, RealPoint neck, RealPoint shoulder1, 
-    RealPoint shoulder2) -> bool"""
+        """
+        GetBranchingAttachmentInfo(int attachment, RealPoint root, RealPoint neck, RealPoint shoulder1, 
+            RealPoint shoulder2) -> bool
+        """
         return _ogl.PyShape_GetBranchingAttachmentInfo(*args, **kwargs)
 
     def GetBranchingAttachmentPoint(*args, **kwargs):
@@ -857,12 +900,16 @@ class PyShape(PyShapeEvtHandler):
         """GetRotation() -> double"""
         return _ogl.PyShape_GetRotation(*args, **kwargs)
 
+    def SetRotation(*args, **kwargs):
+        """SetRotation(double rotation)"""
+        return _ogl.PyShape_SetRotation(*args, **kwargs)
+
     def ClearAttachments(*args, **kwargs):
         """ClearAttachments()"""
         return _ogl.PyShape_ClearAttachments(*args, **kwargs)
 
     def Recentre(*args, **kwargs):
-        """Recentre(wxDC dc)"""
+        """Recentre(DC dc)"""
         return _ogl.PyShape_Recentre(*args, **kwargs)
 
     def ClearPointList(*args, **kwargs):
@@ -882,31 +929,31 @@ class PyShape(PyShapeEvtHandler):
         return _ogl.PyShape_base_OnDelete(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):
-        """base_OnDraw(wxDC dc)"""
+        """base_OnDraw(DC dc)"""
         return _ogl.PyShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):
-        """base_OnDrawContents(wxDC dc)"""
+        """base_OnDrawContents(DC dc)"""
         return _ogl.PyShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):
-        """base_OnDrawBranches(wxDC dc, bool erase=False)"""
+        """base_OnDrawBranches(DC dc, bool erase=False)"""
         return _ogl.PyShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):
-        """base_OnMoveLinks(wxDC dc)"""
+        """base_OnMoveLinks(DC dc)"""
         return _ogl.PyShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):
-        """base_OnErase(wxDC dc)"""
+        """base_OnErase(DC dc)"""
         return _ogl.PyShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):
-        """base_OnEraseContents(wxDC dc)"""
+        """base_OnEraseContents(DC dc)"""
         return _ogl.PyShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):
-        """base_OnHighlight(wxDC dc)"""
+        """base_OnHighlight(DC dc)"""
         return _ogl.PyShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):
@@ -926,13 +973,17 @@ class PyShape(PyShapeEvtHandler):
         return _ogl.PyShape_base_OnSize(*args, **kwargs)
 
     def base_OnMovePre(*args, **kwargs):
-        """base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
-    bool display=True) -> bool"""
+        """
+        base_OnMovePre(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(wxDC dc, double x, double y, double old_x, double old_y, 
-    bool display=True)"""
+        """
+        base_OnMovePost(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):
@@ -960,34 +1011,40 @@ class PyShape(PyShapeEvtHandler):
         return _ogl.PyShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):
-        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        """base_OnDrawOutline(DC dc, double x, double y, double w, double h)"""
         return _ogl.PyShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):
-        """base_OnDrawControlPoints(wxDC dc)"""
+        """base_OnDrawControlPoints(DC dc)"""
         return _ogl.PyShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):
-        """base_OnEraseControlPoints(wxDC dc)"""
+        """base_OnEraseControlPoints(DC dc)"""
         return _ogl.PyShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):
-        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        """base_OnMoveLink(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingDragLeft(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingBeginDragLeft(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+            int attachment=0)
+        """
         return _ogl.PyShape_base_OnSizingEndDragLeft(*args, **kwargs)
 
     def base_OnBeginSize(*args, **kwargs):
@@ -1009,7 +1066,6 @@ _ogl.PyShape_swigregister(PyShapePtr)
 oglMETAFLAGS_OUTLINE = _ogl.oglMETAFLAGS_OUTLINE
 oglMETAFLAGS_ATTACHMENTS = _ogl.oglMETAFLAGS_ATTACHMENTS
 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):
@@ -1025,7 +1081,7 @@ class PseudoMetaFile(core.Object):
         except: pass
 
     def Draw(*args, **kwargs):
-        """Draw(wxDC dc, double xoffset, double yoffset)"""
+        """Draw(DC dc, double xoffset, double yoffset)"""
         return _ogl.PseudoMetaFile_Draw(*args, **kwargs)
 
     def Clear(*args, **kwargs):
@@ -1053,7 +1109,7 @@ class PseudoMetaFile(core.Object):
         return _ogl.PseudoMetaFile_Rotate(*args, **kwargs)
 
     def LoadFromMetaFile(*args, **kwargs):
-        """LoadFromMetaFile(wxString filename, double width, double height) -> bool"""
+        """LoadFromMetaFile(String filename, double width, double height) -> bool"""
         return _ogl.PseudoMetaFile_LoadFromMetaFile(*args, **kwargs)
 
     def GetBounds(*args, **kwargs):
@@ -1133,7 +1189,7 @@ class PseudoMetaFile(core.Object):
         return _ogl.PseudoMetaFile_DrawPoint(*args, **kwargs)
 
     def DrawText(*args, **kwargs):
-        """DrawText(wxString text, Point pt)"""
+        """DrawText(String text, Point pt)"""
         return _ogl.PseudoMetaFile_DrawText(*args, **kwargs)
 
     def DrawLines(*args, **kwargs):
@@ -1165,15 +1221,15 @@ class PseudoMetaFile(core.Object):
         return _ogl.PseudoMetaFile_SetBrush(*args, **kwargs)
 
     def SetFont(*args, **kwargs):
-        """SetFont(wxFont font)"""
+        """SetFont(Font font)"""
         return _ogl.PseudoMetaFile_SetFont(*args, **kwargs)
 
     def SetTextColour(*args, **kwargs):
-        """SetTextColour(wxColour colour)"""
+        """SetTextColour(Colour colour)"""
         return _ogl.PseudoMetaFile_SetTextColour(*args, **kwargs)
 
     def SetBackgroundColour(*args, **kwargs):
-        """SetBackgroundColour(wxColour colour)"""
+        """SetBackgroundColour(Colour colour)"""
         return _ogl.PseudoMetaFile_SetBackgroundColour(*args, **kwargs)
 
     def SetBackgroundMode(*args, **kwargs):
@@ -1189,7 +1245,6 @@ class PseudoMetaFilePtr(PseudoMetaFile):
 _ogl.PseudoMetaFile_swigregister(PseudoMetaFilePtr)
 
 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):
@@ -1208,36 +1263,40 @@ class PyRectangleShape(PyShape):
         """SetCornerRadius(double radius)"""
         return _ogl.PyRectangleShape_SetCornerRadius(*args, **kwargs)
 
+    def GetCornerRadius(*args, **kwargs):
+        """GetCornerRadius() -> double"""
+        return _ogl.PyRectangleShape_GetCornerRadius(*args, **kwargs)
+
     def base_OnDelete(*args, **kwargs):
         """base_OnDelete()"""
         return _ogl.PyRectangleShape_base_OnDelete(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):
-        """base_OnDraw(wxDC dc)"""
+        """base_OnDraw(DC dc)"""
         return _ogl.PyRectangleShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):
-        """base_OnDrawContents(wxDC dc)"""
+        """base_OnDrawContents(DC dc)"""
         return _ogl.PyRectangleShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):
-        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        """base_OnDrawBranches(DC dc, bool erase=FALSE)"""
         return _ogl.PyRectangleShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):
-        """base_OnMoveLinks(wxDC dc)"""
+        """base_OnMoveLinks(DC dc)"""
         return _ogl.PyRectangleShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):
-        """base_OnErase(wxDC dc)"""
+        """base_OnErase(DC dc)"""
         return _ogl.PyRectangleShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):
-        """base_OnEraseContents(wxDC dc)"""
+        """base_OnEraseContents(DC dc)"""
         return _ogl.PyRectangleShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):
-        """base_OnHighlight(wxDC dc)"""
+        """base_OnHighlight(DC dc)"""
         return _ogl.PyRectangleShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):
@@ -1257,13 +1316,17 @@ class PyRectangleShape(PyShape):
         return _ogl.PyRectangleShape_base_OnSize(*args, **kwargs)
 
     def base_OnMovePre(*args, **kwargs):
-        """base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
-    bool display=True) -> bool"""
+        """
+        base_OnMovePre(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(wxDC dc, double x, double y, double old_x, double old_y, 
-    bool display=True)"""
+        """
+        base_OnMovePost(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):
@@ -1291,34 +1354,40 @@ class PyRectangleShape(PyShape):
         return _ogl.PyRectangleShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):
-        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        """base_OnDrawOutline(DC dc, double x, double y, double w, double h)"""
         return _ogl.PyRectangleShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):
-        """base_OnDrawControlPoints(wxDC dc)"""
+        """base_OnDrawControlPoints(DC dc)"""
         return _ogl.PyRectangleShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):
-        """base_OnEraseControlPoints(wxDC dc)"""
+        """base_OnEraseControlPoints(DC dc)"""
         return _ogl.PyRectangleShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):
-        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        """base_OnMoveLink(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingDragLeft(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingBeginDragLeft(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+            int attachment=0)
+        """
         return _ogl.PyRectangleShape_base_OnSizingEndDragLeft(*args, **kwargs)
 
     def base_OnBeginSize(*args, **kwargs):
@@ -1338,13 +1407,14 @@ class PyRectangleShapePtr(PyRectangleShape):
 _ogl.PyRectangleShape_swigregister(PyRectangleShapePtr)
 
 class PyControlPoint(PyRectangleShape):
-    """"""
     def __repr__(self):
         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, 
-    double size=0.0, double the_xoffset=0.0, double the_yoffset=0.0, 
-    int the_type=0) -> PyControlPoint"""
+        """
+        __init__(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
+        """
         newobj = _ogl.new_PyControlPoint(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
@@ -1364,31 +1434,31 @@ class PyControlPoint(PyRectangleShape):
         return _ogl.PyControlPoint_base_OnDelete(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):
-        """base_OnDraw(wxDC dc)"""
+        """base_OnDraw(DC dc)"""
         return _ogl.PyControlPoint_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):
-        """base_OnDrawContents(wxDC dc)"""
+        """base_OnDrawContents(DC dc)"""
         return _ogl.PyControlPoint_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):
-        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        """base_OnDrawBranches(DC dc, bool erase=FALSE)"""
         return _ogl.PyControlPoint_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):
-        """base_OnMoveLinks(wxDC dc)"""
+        """base_OnMoveLinks(DC dc)"""
         return _ogl.PyControlPoint_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):
-        """base_OnErase(wxDC dc)"""
+        """base_OnErase(DC dc)"""
         return _ogl.PyControlPoint_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):
-        """base_OnEraseContents(wxDC dc)"""
+        """base_OnEraseContents(DC dc)"""
         return _ogl.PyControlPoint_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):
-        """base_OnHighlight(wxDC dc)"""
+        """base_OnHighlight(DC dc)"""
         return _ogl.PyControlPoint_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):
@@ -1408,13 +1478,17 @@ class PyControlPoint(PyRectangleShape):
         return _ogl.PyControlPoint_base_OnSize(*args, **kwargs)
 
     def base_OnMovePre(*args, **kwargs):
-        """base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
-    bool display=True) -> bool"""
+        """
+        base_OnMovePre(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(wxDC dc, double x, double y, double old_x, double old_y, 
-    bool display=True)"""
+        """
+        base_OnMovePost(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):
@@ -1442,34 +1516,40 @@ class PyControlPoint(PyRectangleShape):
         return _ogl.PyControlPoint_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):
-        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        """base_OnDrawOutline(DC dc, double x, double y, double w, double h)"""
         return _ogl.PyControlPoint_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):
-        """base_OnDrawControlPoints(wxDC dc)"""
+        """base_OnDrawControlPoints(DC dc)"""
         return _ogl.PyControlPoint_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):
-        """base_OnEraseControlPoints(wxDC dc)"""
+        """base_OnEraseControlPoints(DC dc)"""
         return _ogl.PyControlPoint_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):
-        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        """base_OnMoveLink(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingDragLeft(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingBeginDragLeft(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+            int attachment=0)
+        """
         return _ogl.PyControlPoint_base_OnSizingEndDragLeft(*args, **kwargs)
 
     def base_OnBeginSize(*args, **kwargs):
@@ -1489,7 +1569,6 @@ class PyControlPointPtr(PyControlPoint):
 _ogl.PyControlPoint_swigregister(PyControlPointPtr)
 
 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):
@@ -1505,19 +1584,19 @@ class PyBitmapShape(PyRectangleShape):
         return _ogl.PyBitmapShape__setCallbackInfo(*args, **kwargs)
 
     def GetBitmap(*args, **kwargs):
-        """GetBitmap() -> wxBitmap"""
+        """GetBitmap() -> Bitmap"""
         return _ogl.PyBitmapShape_GetBitmap(*args, **kwargs)
 
     def GetFilename(*args, **kwargs):
-        """GetFilename() -> wxString"""
+        """GetFilename() -> String"""
         return _ogl.PyBitmapShape_GetFilename(*args, **kwargs)
 
     def SetBitmap(*args, **kwargs):
-        """SetBitmap(wxBitmap bitmap)"""
+        """SetBitmap(Bitmap bitmap)"""
         return _ogl.PyBitmapShape_SetBitmap(*args, **kwargs)
 
     def SetFilename(*args, **kwargs):
-        """SetFilename(wxString filename)"""
+        """SetFilename(String filename)"""
         return _ogl.PyBitmapShape_SetFilename(*args, **kwargs)
 
     def base_OnDelete(*args, **kwargs):
@@ -1525,31 +1604,31 @@ class PyBitmapShape(PyRectangleShape):
         return _ogl.PyBitmapShape_base_OnDelete(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):
-        """base_OnDraw(wxDC dc)"""
+        """base_OnDraw(DC dc)"""
         return _ogl.PyBitmapShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):
-        """base_OnDrawContents(wxDC dc)"""
+        """base_OnDrawContents(DC dc)"""
         return _ogl.PyBitmapShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):
-        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        """base_OnDrawBranches(DC dc, bool erase=FALSE)"""
         return _ogl.PyBitmapShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):
-        """base_OnMoveLinks(wxDC dc)"""
+        """base_OnMoveLinks(DC dc)"""
         return _ogl.PyBitmapShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):
-        """base_OnErase(wxDC dc)"""
+        """base_OnErase(DC dc)"""
         return _ogl.PyBitmapShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):
-        """base_OnEraseContents(wxDC dc)"""
+        """base_OnEraseContents(DC dc)"""
         return _ogl.PyBitmapShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):
-        """base_OnHighlight(wxDC dc)"""
+        """base_OnHighlight(DC dc)"""
         return _ogl.PyBitmapShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):
@@ -1569,13 +1648,17 @@ class PyBitmapShape(PyRectangleShape):
         return _ogl.PyBitmapShape_base_OnSize(*args, **kwargs)
 
     def base_OnMovePre(*args, **kwargs):
-        """base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
-    bool display=True) -> bool"""
+        """
+        base_OnMovePre(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(wxDC dc, double x, double y, double old_x, double old_y, 
-    bool display=True)"""
+        """
+        base_OnMovePost(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):
@@ -1603,34 +1686,40 @@ class PyBitmapShape(PyRectangleShape):
         return _ogl.PyBitmapShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):
-        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        """base_OnDrawOutline(DC dc, double x, double y, double w, double h)"""
         return _ogl.PyBitmapShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):
-        """base_OnDrawControlPoints(wxDC dc)"""
+        """base_OnDrawControlPoints(DC dc)"""
         return _ogl.PyBitmapShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):
-        """base_OnEraseControlPoints(wxDC dc)"""
+        """base_OnEraseControlPoints(DC dc)"""
         return _ogl.PyBitmapShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):
-        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        """base_OnMoveLink(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingDragLeft(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingBeginDragLeft(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+            int attachment=0)
+        """
         return _ogl.PyBitmapShape_base_OnSizingEndDragLeft(*args, **kwargs)
 
     def base_OnBeginSize(*args, **kwargs):
@@ -1650,7 +1739,6 @@ class PyBitmapShapePtr(PyBitmapShape):
 _ogl.PyBitmapShape_swigregister(PyBitmapShapePtr)
 
 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):
@@ -1714,7 +1802,7 @@ class PyDrawnShape(PyRectangleShape):
         return _ogl.PyDrawnShape_DrawSpline(*args, **kwargs)
 
     def DrawText(*args, **kwargs):
-        """DrawText(wxString text, Point point)"""
+        """DrawText(String text, Point point)"""
         return _ogl.PyDrawnShape_DrawText(*args, **kwargs)
 
     def GetAngle(*args, **kwargs):
@@ -1730,7 +1818,7 @@ class PyDrawnShape(PyRectangleShape):
         return _ogl.PyDrawnShape_GetRotation(*args, **kwargs)
 
     def LoadFromMetaFile(*args, **kwargs):
-        """LoadFromMetaFile(wxString filename) -> bool"""
+        """LoadFromMetaFile(String filename) -> bool"""
         return _ogl.PyDrawnShape_LoadFromMetaFile(*args, **kwargs)
 
     def Rotate(*args, **kwargs):
@@ -1742,7 +1830,7 @@ class PyDrawnShape(PyRectangleShape):
         return _ogl.PyDrawnShape_SetClippingRect(*args, **kwargs)
 
     def SetDrawnBackgroundColour(*args, **kwargs):
-        """SetDrawnBackgroundColour(wxColour colour)"""
+        """SetDrawnBackgroundColour(Colour colour)"""
         return _ogl.PyDrawnShape_SetDrawnBackgroundColour(*args, **kwargs)
 
     def SetDrawnBackgroundMode(*args, **kwargs):
@@ -1754,7 +1842,7 @@ class PyDrawnShape(PyRectangleShape):
         return _ogl.PyDrawnShape_SetDrawnBrush(*args, **kwargs)
 
     def SetDrawnFont(*args, **kwargs):
-        """SetDrawnFont(wxFont font)"""
+        """SetDrawnFont(Font font)"""
         return _ogl.PyDrawnShape_SetDrawnFont(*args, **kwargs)
 
     def SetDrawnPen(*args, **kwargs):
@@ -1762,7 +1850,7 @@ class PyDrawnShape(PyRectangleShape):
         return _ogl.PyDrawnShape_SetDrawnPen(*args, **kwargs)
 
     def SetDrawnTextColour(*args, **kwargs):
-        """SetDrawnTextColour(wxColour colour)"""
+        """SetDrawnTextColour(Colour colour)"""
         return _ogl.PyDrawnShape_SetDrawnTextColour(*args, **kwargs)
 
     def Scale(*args, **kwargs):
@@ -1782,31 +1870,31 @@ class PyDrawnShape(PyRectangleShape):
         return _ogl.PyDrawnShape_base_OnDelete(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):
-        """base_OnDraw(wxDC dc)"""
+        """base_OnDraw(DC dc)"""
         return _ogl.PyDrawnShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):
-        """base_OnDrawContents(wxDC dc)"""
+        """base_OnDrawContents(DC dc)"""
         return _ogl.PyDrawnShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):
-        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        """base_OnDrawBranches(DC dc, bool erase=FALSE)"""
         return _ogl.PyDrawnShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):
-        """base_OnMoveLinks(wxDC dc)"""
+        """base_OnMoveLinks(DC dc)"""
         return _ogl.PyDrawnShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):
-        """base_OnErase(wxDC dc)"""
+        """base_OnErase(DC dc)"""
         return _ogl.PyDrawnShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):
-        """base_OnEraseContents(wxDC dc)"""
+        """base_OnEraseContents(DC dc)"""
         return _ogl.PyDrawnShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):
-        """base_OnHighlight(wxDC dc)"""
+        """base_OnHighlight(DC dc)"""
         return _ogl.PyDrawnShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):
@@ -1826,13 +1914,17 @@ class PyDrawnShape(PyRectangleShape):
         return _ogl.PyDrawnShape_base_OnSize(*args, **kwargs)
 
     def base_OnMovePre(*args, **kwargs):
-        """base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
-    bool display=True) -> bool"""
+        """
+        base_OnMovePre(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(wxDC dc, double x, double y, double old_x, double old_y, 
-    bool display=True)"""
+        """
+        base_OnMovePost(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):
@@ -1860,34 +1952,40 @@ class PyDrawnShape(PyRectangleShape):
         return _ogl.PyDrawnShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):
-        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        """base_OnDrawOutline(DC dc, double x, double y, double w, double h)"""
         return _ogl.PyDrawnShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):
-        """base_OnDrawControlPoints(wxDC dc)"""
+        """base_OnDrawControlPoints(DC dc)"""
         return _ogl.PyDrawnShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):
-        """base_OnEraseControlPoints(wxDC dc)"""
+        """base_OnEraseControlPoints(DC dc)"""
         return _ogl.PyDrawnShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):
-        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        """base_OnMoveLink(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingDragLeft(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingBeginDragLeft(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+            int attachment=0)
+        """
         return _ogl.PyDrawnShape_base_OnSizingEndDragLeft(*args, **kwargs)
 
     def base_OnBeginSize(*args, **kwargs):
@@ -1907,7 +2005,6 @@ class PyDrawnShapePtr(PyDrawnShape):
 _ogl.PyDrawnShape_swigregister(PyDrawnShapePtr)
 
 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):
@@ -1937,7 +2034,6 @@ class OGLConstraintPtr(OGLConstraint):
 _ogl.OGLConstraint_swigregister(OGLConstraintPtr)
 
 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):
@@ -2013,31 +2109,31 @@ class PyCompositeShape(PyRectangleShape):
         return _ogl.PyCompositeShape_base_OnDelete(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):
-        """base_OnDraw(wxDC dc)"""
+        """base_OnDraw(DC dc)"""
         return _ogl.PyCompositeShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):
-        """base_OnDrawContents(wxDC dc)"""
+        """base_OnDrawContents(DC dc)"""
         return _ogl.PyCompositeShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):
-        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        """base_OnDrawBranches(DC dc, bool erase=FALSE)"""
         return _ogl.PyCompositeShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):
-        """base_OnMoveLinks(wxDC dc)"""
+        """base_OnMoveLinks(DC dc)"""
         return _ogl.PyCompositeShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):
-        """base_OnErase(wxDC dc)"""
+        """base_OnErase(DC dc)"""
         return _ogl.PyCompositeShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):
-        """base_OnEraseContents(wxDC dc)"""
+        """base_OnEraseContents(DC dc)"""
         return _ogl.PyCompositeShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):
-        """base_OnHighlight(wxDC dc)"""
+        """base_OnHighlight(DC dc)"""
         return _ogl.PyCompositeShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):
@@ -2057,13 +2153,17 @@ class PyCompositeShape(PyRectangleShape):
         return _ogl.PyCompositeShape_base_OnSize(*args, **kwargs)
 
     def base_OnMovePre(*args, **kwargs):
-        """base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
-    bool display=True) -> bool"""
+        """
+        base_OnMovePre(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(wxDC dc, double x, double y, double old_x, double old_y, 
-    bool display=True)"""
+        """
+        base_OnMovePost(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):
@@ -2091,34 +2191,40 @@ class PyCompositeShape(PyRectangleShape):
         return _ogl.PyCompositeShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):
-        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        """base_OnDrawOutline(DC dc, double x, double y, double w, double h)"""
         return _ogl.PyCompositeShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):
-        """base_OnDrawControlPoints(wxDC dc)"""
+        """base_OnDrawControlPoints(DC dc)"""
         return _ogl.PyCompositeShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):
-        """base_OnEraseControlPoints(wxDC dc)"""
+        """base_OnEraseControlPoints(DC dc)"""
         return _ogl.PyCompositeShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):
-        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        """base_OnMoveLink(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingDragLeft(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingBeginDragLeft(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+            int attachment=0)
+        """
         return _ogl.PyCompositeShape_base_OnSizingEndDragLeft(*args, **kwargs)
 
     def base_OnBeginSize(*args, **kwargs):
@@ -2138,7 +2244,6 @@ class PyCompositeShapePtr(PyCompositeShape):
 _ogl.PyCompositeShape_swigregister(PyCompositeShapePtr)
 
 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):
@@ -2166,31 +2271,31 @@ class PyDividedShape(PyRectangleShape):
         return _ogl.PyDividedShape_base_OnDelete(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):
-        """base_OnDraw(wxDC dc)"""
+        """base_OnDraw(DC dc)"""
         return _ogl.PyDividedShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):
-        """base_OnDrawContents(wxDC dc)"""
+        """base_OnDrawContents(DC dc)"""
         return _ogl.PyDividedShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):
-        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        """base_OnDrawBranches(DC dc, bool erase=FALSE)"""
         return _ogl.PyDividedShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):
-        """base_OnMoveLinks(wxDC dc)"""
+        """base_OnMoveLinks(DC dc)"""
         return _ogl.PyDividedShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):
-        """base_OnErase(wxDC dc)"""
+        """base_OnErase(DC dc)"""
         return _ogl.PyDividedShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):
-        """base_OnEraseContents(wxDC dc)"""
+        """base_OnEraseContents(DC dc)"""
         return _ogl.PyDividedShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):
-        """base_OnHighlight(wxDC dc)"""
+        """base_OnHighlight(DC dc)"""
         return _ogl.PyDividedShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):
@@ -2210,13 +2315,17 @@ class PyDividedShape(PyRectangleShape):
         return _ogl.PyDividedShape_base_OnSize(*args, **kwargs)
 
     def base_OnMovePre(*args, **kwargs):
-        """base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
-    bool display=True) -> bool"""
+        """
+        base_OnMovePre(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(wxDC dc, double x, double y, double old_x, double old_y, 
-    bool display=True)"""
+        """
+        base_OnMovePost(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):
@@ -2244,34 +2353,40 @@ class PyDividedShape(PyRectangleShape):
         return _ogl.PyDividedShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):
-        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        """base_OnDrawOutline(DC dc, double x, double y, double w, double h)"""
         return _ogl.PyDividedShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):
-        """base_OnDrawControlPoints(wxDC dc)"""
+        """base_OnDrawControlPoints(DC dc)"""
         return _ogl.PyDividedShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):
-        """base_OnEraseControlPoints(wxDC dc)"""
+        """base_OnEraseControlPoints(DC dc)"""
         return _ogl.PyDividedShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):
-        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        """base_OnMoveLink(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingDragLeft(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingBeginDragLeft(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+            int attachment=0)
+        """
         return _ogl.PyDividedShape_base_OnSizingEndDragLeft(*args, **kwargs)
 
     def base_OnBeginSize(*args, **kwargs):
@@ -2291,7 +2406,6 @@ class PyDividedShapePtr(PyDividedShape):
 _ogl.PyDividedShape_swigregister(PyDividedShapePtr)
 
 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):
@@ -2343,7 +2457,7 @@ class PyDivisionShape(PyCompositeShape):
         return _ogl.PyDivisionShape_GetLeftSide(*args, **kwargs)
 
     def GetLeftSideColour(*args, **kwargs):
-        """GetLeftSideColour() -> wxString"""
+        """GetLeftSideColour() -> String"""
         return _ogl.PyDivisionShape_GetLeftSideColour(*args, **kwargs)
 
     def GetLeftSidePen(*args, **kwargs):
@@ -2383,7 +2497,7 @@ class PyDivisionShape(PyCompositeShape):
         return _ogl.PyDivisionShape_SetLeftSide(*args, **kwargs)
 
     def SetLeftSideColour(*args, **kwargs):
-        """SetLeftSideColour(wxString colour)"""
+        """SetLeftSideColour(String colour)"""
         return _ogl.PyDivisionShape_SetLeftSideColour(*args, **kwargs)
 
     def SetLeftSidePen(*args, **kwargs):
@@ -2399,7 +2513,7 @@ class PyDivisionShape(PyCompositeShape):
         return _ogl.PyDivisionShape_SetTopSide(*args, **kwargs)
 
     def SetTopSideColour(*args, **kwargs):
-        """SetTopSideColour(wxString colour)"""
+        """SetTopSideColour(String colour)"""
         return _ogl.PyDivisionShape_SetTopSideColour(*args, **kwargs)
 
     def SetTopSidePen(*args, **kwargs):
@@ -2411,31 +2525,31 @@ class PyDivisionShape(PyCompositeShape):
         return _ogl.PyDivisionShape_base_OnDelete(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):
-        """base_OnDraw(wxDC dc)"""
+        """base_OnDraw(DC dc)"""
         return _ogl.PyDivisionShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):
-        """base_OnDrawContents(wxDC dc)"""
+        """base_OnDrawContents(DC dc)"""
         return _ogl.PyDivisionShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):
-        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        """base_OnDrawBranches(DC dc, bool erase=FALSE)"""
         return _ogl.PyDivisionShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):
-        """base_OnMoveLinks(wxDC dc)"""
+        """base_OnMoveLinks(DC dc)"""
         return _ogl.PyDivisionShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):
-        """base_OnErase(wxDC dc)"""
+        """base_OnErase(DC dc)"""
         return _ogl.PyDivisionShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):
-        """base_OnEraseContents(wxDC dc)"""
+        """base_OnEraseContents(DC dc)"""
         return _ogl.PyDivisionShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):
-        """base_OnHighlight(wxDC dc)"""
+        """base_OnHighlight(DC dc)"""
         return _ogl.PyDivisionShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):
@@ -2455,13 +2569,17 @@ class PyDivisionShape(PyCompositeShape):
         return _ogl.PyDivisionShape_base_OnSize(*args, **kwargs)
 
     def base_OnMovePre(*args, **kwargs):
-        """base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
-    bool display=True) -> bool"""
+        """
+        base_OnMovePre(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(wxDC dc, double x, double y, double old_x, double old_y, 
-    bool display=True)"""
+        """
+        base_OnMovePost(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):
@@ -2489,34 +2607,40 @@ class PyDivisionShape(PyCompositeShape):
         return _ogl.PyDivisionShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):
-        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        """base_OnDrawOutline(DC dc, double x, double y, double w, double h)"""
         return _ogl.PyDivisionShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):
-        """base_OnDrawControlPoints(wxDC dc)"""
+        """base_OnDrawControlPoints(DC dc)"""
         return _ogl.PyDivisionShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):
-        """base_OnEraseControlPoints(wxDC dc)"""
+        """base_OnEraseControlPoints(DC dc)"""
         return _ogl.PyDivisionShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):
-        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        """base_OnMoveLink(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingDragLeft(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingBeginDragLeft(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+            int attachment=0)
+        """
         return _ogl.PyDivisionShape_base_OnSizingEndDragLeft(*args, **kwargs)
 
     def base_OnBeginSize(*args, **kwargs):
@@ -2536,7 +2660,6 @@ class PyDivisionShapePtr(PyDivisionShape):
 _ogl.PyDivisionShape_swigregister(PyDivisionShapePtr)
 
 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):
@@ -2552,31 +2675,31 @@ class PyEllipseShape(PyShape):
         return _ogl.PyEllipseShape__setCallbackInfo(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):
-        """base_OnDraw(wxDC dc)"""
+        """base_OnDraw(DC dc)"""
         return _ogl.PyEllipseShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):
-        """base_OnDrawContents(wxDC dc)"""
+        """base_OnDrawContents(DC dc)"""
         return _ogl.PyEllipseShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):
-        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        """base_OnDrawBranches(DC dc, bool erase=FALSE)"""
         return _ogl.PyEllipseShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):
-        """base_OnMoveLinks(wxDC dc)"""
+        """base_OnMoveLinks(DC dc)"""
         return _ogl.PyEllipseShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):
-        """base_OnErase(wxDC dc)"""
+        """base_OnErase(DC dc)"""
         return _ogl.PyEllipseShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):
-        """base_OnEraseContents(wxDC dc)"""
+        """base_OnEraseContents(DC dc)"""
         return _ogl.PyEllipseShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):
-        """base_OnHighlight(wxDC dc)"""
+        """base_OnHighlight(DC dc)"""
         return _ogl.PyEllipseShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):
@@ -2596,13 +2719,17 @@ class PyEllipseShape(PyShape):
         return _ogl.PyEllipseShape_base_OnSize(*args, **kwargs)
 
     def base_OnMovePre(*args, **kwargs):
-        """base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
-    bool display=True) -> bool"""
+        """
+        base_OnMovePre(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(wxDC dc, double x, double y, double old_x, double old_y, 
-    bool display=True)"""
+        """
+        base_OnMovePost(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):
@@ -2630,34 +2757,40 @@ class PyEllipseShape(PyShape):
         return _ogl.PyEllipseShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):
-        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        """base_OnDrawOutline(DC dc, double x, double y, double w, double h)"""
         return _ogl.PyEllipseShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):
-        """base_OnDrawControlPoints(wxDC dc)"""
+        """base_OnDrawControlPoints(DC dc)"""
         return _ogl.PyEllipseShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):
-        """base_OnEraseControlPoints(wxDC dc)"""
+        """base_OnEraseControlPoints(DC dc)"""
         return _ogl.PyEllipseShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):
-        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        """base_OnMoveLink(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingDragLeft(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingBeginDragLeft(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+            int attachment=0)
+        """
         return _ogl.PyEllipseShape_base_OnSizingEndDragLeft(*args, **kwargs)
 
     def base_OnBeginSize(*args, **kwargs):
@@ -2677,7 +2810,6 @@ class PyEllipseShapePtr(PyEllipseShape):
 _ogl.PyEllipseShape_swigregister(PyEllipseShapePtr)
 
 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):
@@ -2693,31 +2825,31 @@ class PyCircleShape(PyEllipseShape):
         return _ogl.PyCircleShape__setCallbackInfo(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):
-        """base_OnDraw(wxDC dc)"""
+        """base_OnDraw(DC dc)"""
         return _ogl.PyCircleShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):
-        """base_OnDrawContents(wxDC dc)"""
+        """base_OnDrawContents(DC dc)"""
         return _ogl.PyCircleShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):
-        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        """base_OnDrawBranches(DC dc, bool erase=FALSE)"""
         return _ogl.PyCircleShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):
-        """base_OnMoveLinks(wxDC dc)"""
+        """base_OnMoveLinks(DC dc)"""
         return _ogl.PyCircleShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):
-        """base_OnErase(wxDC dc)"""
+        """base_OnErase(DC dc)"""
         return _ogl.PyCircleShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):
-        """base_OnEraseContents(wxDC dc)"""
+        """base_OnEraseContents(DC dc)"""
         return _ogl.PyCircleShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):
-        """base_OnHighlight(wxDC dc)"""
+        """base_OnHighlight(DC dc)"""
         return _ogl.PyCircleShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):
@@ -2737,13 +2869,17 @@ class PyCircleShape(PyEllipseShape):
         return _ogl.PyCircleShape_base_OnSize(*args, **kwargs)
 
     def base_OnMovePre(*args, **kwargs):
-        """base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
-    bool display=True) -> bool"""
+        """
+        base_OnMovePre(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(wxDC dc, double x, double y, double old_x, double old_y, 
-    bool display=True)"""
+        """
+        base_OnMovePost(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):
@@ -2771,34 +2907,40 @@ class PyCircleShape(PyEllipseShape):
         return _ogl.PyCircleShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):
-        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        """base_OnDrawOutline(DC dc, double x, double y, double w, double h)"""
         return _ogl.PyCircleShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):
-        """base_OnDrawControlPoints(wxDC dc)"""
+        """base_OnDrawControlPoints(DC dc)"""
         return _ogl.PyCircleShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):
-        """base_OnEraseControlPoints(wxDC dc)"""
+        """base_OnEraseControlPoints(DC dc)"""
         return _ogl.PyCircleShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):
-        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        """base_OnMoveLink(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingDragLeft(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingBeginDragLeft(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+            int attachment=0)
+        """
         return _ogl.PyCircleShape_base_OnSizingEndDragLeft(*args, **kwargs)
 
     def base_OnBeginSize(*args, **kwargs):
@@ -2818,13 +2960,14 @@ class PyCircleShapePtr(PyCircleShape):
 _ogl.PyCircleShape_swigregister(PyCircleShapePtr)
 
 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, 
-    wxString name=wxPyEmptyString, PseudoMetaFile mf=None, 
-    long arrowId=-1) -> ArrowHead"""
+        """
+        __init__(int type=0, int end=0, double size=0.0, double dist=0.0, 
+            String name=EmptyString, PseudoMetaFile mf=None, 
+            long arrowId=-1) -> ArrowHead
+        """
         newobj = _ogl.new_ArrowHead(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
@@ -2864,7 +3007,7 @@ class ArrowHead(core.Object):
         return _ogl.ArrowHead_GetSize(*args, **kwargs)
 
     def GetName(*args, **kwargs):
-        """GetName() -> wxString"""
+        """GetName() -> String"""
         return _ogl.ArrowHead_GetName(*args, **kwargs)
 
     def SetXOffset(*args, **kwargs):
@@ -2908,7 +3051,6 @@ class ArrowHeadPtr(ArrowHead):
 _ogl.ArrowHead_swigregister(ArrowHeadPtr)
 
 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):
@@ -2924,9 +3066,11 @@ class PyLineShape(PyShape):
         return _ogl.PyLineShape__setCallbackInfo(*args, **kwargs)
 
     def AddArrow(*args, **kwargs):
-        """AddArrow(int type, int end=ARROW_POSITION_END, double arrowSize=10.0, 
-    double xOffset=0.0, wxString name=wxPyEmptyString, 
-    PseudoMetaFile mf=None, long arrowId=-1)"""
+        """
+        AddArrow(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):
@@ -2934,7 +3078,7 @@ class PyLineShape(PyShape):
         return _ogl.PyLineShape_AddArrowOrdered(*args, **kwargs)
 
     def ClearArrow(*args, **kwargs):
-        """ClearArrow(wxString name) -> bool"""
+        """ClearArrow(String name) -> bool"""
         return _ogl.PyLineShape_ClearArrow(*args, **kwargs)
 
     def ClearArrowsAtPosition(*args, **kwargs):
@@ -2942,7 +3086,7 @@ class PyLineShape(PyShape):
         return _ogl.PyLineShape_ClearArrowsAtPosition(*args, **kwargs)
 
     def DrawArrow(*args, **kwargs):
-        """DrawArrow(wxDC dc, ArrowHead arrow, double xOffset, bool proportionalOffset)"""
+        """DrawArrow(DC dc, ArrowHead arrow, double xOffset, bool proportionalOffset)"""
         return _ogl.PyLineShape_DrawArrow(*args, **kwargs)
 
     def DeleteArrowHeadId(*args, **kwargs):
@@ -2950,7 +3094,7 @@ class PyLineShape(PyShape):
         return _ogl.PyLineShape_DeleteArrowHeadId(*args, **kwargs)
 
     def DeleteArrowHead(*args, **kwargs):
-        """DeleteArrowHead(int position, wxString name) -> bool"""
+        """DeleteArrowHead(int position, String name) -> bool"""
         return _ogl.PyLineShape_DeleteArrowHead(*args, **kwargs)
 
     def DeleteLineControlPoint(*args, **kwargs):
@@ -2958,15 +3102,15 @@ class PyLineShape(PyShape):
         return _ogl.PyLineShape_DeleteLineControlPoint(*args, **kwargs)
 
     def DrawArrows(*args, **kwargs):
-        """DrawArrows(wxDC dc)"""
+        """DrawArrows(DC dc)"""
         return _ogl.PyLineShape_DrawArrows(*args, **kwargs)
 
     def DrawRegion(*args, **kwargs):
-        """DrawRegion(wxDC dc, ShapeRegion region, double x, double y)"""
+        """DrawRegion(DC dc, ShapeRegion region, double x, double y)"""
         return _ogl.PyLineShape_DrawRegion(*args, **kwargs)
 
     def EraseRegion(*args, **kwargs):
-        """EraseRegion(wxDC dc, ShapeRegion region, double x, double y)"""
+        """EraseRegion(DC dc, ShapeRegion region, double x, double y)"""
         return _ogl.PyLineShape_EraseRegion(*args, **kwargs)
 
     def FindArrowHeadId(*args, **kwargs):
@@ -2974,7 +3118,7 @@ class PyLineShape(PyShape):
         return _ogl.PyLineShape_FindArrowHeadId(*args, **kwargs)
 
     def FindArrowHead(*args, **kwargs):
-        """FindArrowHead(int position, wxString name) -> ArrowHead"""
+        """FindArrowHead(int position, String name) -> ArrowHead"""
         return _ogl.PyLineShape_FindArrowHead(*args, **kwargs)
 
     def FindLineEndPoints(*args, **kwargs):
@@ -3026,7 +3170,7 @@ class PyLineShape(PyShape):
         return _ogl.PyLineShape_Initialise(*args, **kwargs)
 
     def InsertLineControlPoint(*args, **kwargs):
-        """InsertLineControlPoint(wxDC dc)"""
+        """InsertLineControlPoint(DC dc)"""
         return _ogl.PyLineShape_InsertLineControlPoint(*args, **kwargs)
 
     def IsEnd(*args, **kwargs):
@@ -3078,39 +3222,63 @@ class PyLineShape(PyShape):
         return _ogl.PyLineShape_SetTo(*args, **kwargs)
 
     def Straighten(*args, **kwargs):
-        """Straighten(wxDC dc=None)"""
+        """Straighten(DC dc=None)"""
         return _ogl.PyLineShape_Straighten(*args, **kwargs)
 
     def Unlink(*args, **kwargs):
         """Unlink()"""
         return _ogl.PyLineShape_Unlink(*args, **kwargs)
 
+    def SetAlignmentOrientation(*args, **kwargs):
+        """SetAlignmentOrientation(bool isEnd, bool isHoriz)"""
+        return _ogl.PyLineShape_SetAlignmentOrientation(*args, **kwargs)
+
+    def SetAlignmentType(*args, **kwargs):
+        """SetAlignmentType(bool isEnd, int alignType)"""
+        return _ogl.PyLineShape_SetAlignmentType(*args, **kwargs)
+
+    def GetAlignmentOrientation(*args, **kwargs):
+        """GetAlignmentOrientation(bool isEnd) -> bool"""
+        return _ogl.PyLineShape_GetAlignmentOrientation(*args, **kwargs)
+
+    def GetAlignmentType(*args, **kwargs):
+        """GetAlignmentType(bool isEnd) -> int"""
+        return _ogl.PyLineShape_GetAlignmentType(*args, **kwargs)
+
+    def GetAlignmentStart(*args, **kwargs):
+        """GetAlignmentStart() -> int"""
+        return _ogl.PyLineShape_GetAlignmentStart(*args, **kwargs)
+
+    def GetAlignmentEnd(*args, **kwargs):
+        """GetAlignmentEnd() -> int"""
+        return _ogl.PyLineShape_GetAlignmentEnd(*args, **kwargs)
+
     def base_OnDraw(*args, **kwargs):
-        """base_OnDraw(wxDC dc)"""
+        """base_OnDraw(DC dc)"""
         return _ogl.PyLineShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):
-        """base_OnDrawContents(wxDC dc)"""
+        """base_OnDrawContents(DC dc)"""
         return _ogl.PyLineShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):
-        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        """base_OnDrawBranches(DC dc, bool erase=FALSE)"""
         return _ogl.PyLineShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):
-        """base_OnMoveLinks(wxDC dc)"""
+        """base_OnMoveLinks(DC dc)"""
         return _ogl.PyLineShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):
-        """base_OnErase(wxDC dc)"""
+        """base_OnErase(DC dc)"""
         return _ogl.PyLineShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):
-        """base_OnEraseContents(wxDC dc)"""
+        """base_OnEraseContents(DC dc)"""
         return _ogl.PyLineShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):
-        """base_OnHighlight(wxDC dc)"""
+        """base_OnHighlight(DC dc)"""
         return _ogl.PyLineShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):
@@ -3130,13 +3298,17 @@ class PyLineShape(PyShape):
         return _ogl.PyLineShape_base_OnSize(*args, **kwargs)
 
     def base_OnMovePre(*args, **kwargs):
-        """base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
-    bool display=True) -> bool"""
+        """
+        base_OnMovePre(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(wxDC dc, double x, double y, double old_x, double old_y, 
-    bool display=True)"""
+        """
+        base_OnMovePost(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):
@@ -3164,34 +3336,40 @@ class PyLineShape(PyShape):
         return _ogl.PyLineShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):
-        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        """base_OnDrawOutline(DC dc, double x, double y, double w, double h)"""
         return _ogl.PyLineShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):
-        """base_OnDrawControlPoints(wxDC dc)"""
+        """base_OnDrawControlPoints(DC dc)"""
         return _ogl.PyLineShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):
-        """base_OnEraseControlPoints(wxDC dc)"""
+        """base_OnEraseControlPoints(DC dc)"""
         return _ogl.PyLineShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):
-        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        """base_OnMoveLink(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingDragLeft(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingBeginDragLeft(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+            int attachment=0)
+        """
         return _ogl.PyLineShape_base_OnSizingEndDragLeft(*args, **kwargs)
 
     def base_OnBeginSize(*args, **kwargs):
@@ -3211,7 +3389,6 @@ class PyLineShapePtr(PyLineShape):
 _ogl.PyLineShape_swigregister(PyLineShapePtr)
 
 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):
@@ -3246,36 +3423,56 @@ class PyPolygonShape(PyShape):
         """GetPoints() -> PyObject"""
         return _ogl.PyPolygonShape_GetPoints(*args, **kwargs)
 
+    def GetOriginalPoints(*args, **kwargs):
+        """GetOriginalPoints() -> PyObject"""
+        return _ogl.PyPolygonShape_GetOriginalPoints(*args, **kwargs)
+
+    def GetOriginalWidth(*args, **kwargs):
+        """GetOriginalWidth() -> double"""
+        return _ogl.PyPolygonShape_GetOriginalWidth(*args, **kwargs)
+
+    def GetOriginalHeight(*args, **kwargs):
+        """GetOriginalHeight() -> double"""
+        return _ogl.PyPolygonShape_GetOriginalHeight(*args, **kwargs)
+
+    def SetOriginalWidth(*args, **kwargs):
+        """SetOriginalWidth(double w)"""
+        return _ogl.PyPolygonShape_SetOriginalWidth(*args, **kwargs)
+
+    def SetOriginalHeight(*args, **kwargs):
+        """SetOriginalHeight(double h)"""
+        return _ogl.PyPolygonShape_SetOriginalHeight(*args, **kwargs)
+
     def UpdateOriginalPoints(*args, **kwargs):
         """UpdateOriginalPoints()"""
         return _ogl.PyPolygonShape_UpdateOriginalPoints(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):
-        """base_OnDraw(wxDC dc)"""
+        """base_OnDraw(DC dc)"""
         return _ogl.PyPolygonShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):
-        """base_OnDrawContents(wxDC dc)"""
+        """base_OnDrawContents(DC dc)"""
         return _ogl.PyPolygonShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):
-        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        """base_OnDrawBranches(DC dc, bool erase=FALSE)"""
         return _ogl.PyPolygonShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):
-        """base_OnMoveLinks(wxDC dc)"""
+        """base_OnMoveLinks(DC dc)"""
         return _ogl.PyPolygonShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):
-        """base_OnErase(wxDC dc)"""
+        """base_OnErase(DC dc)"""
         return _ogl.PyPolygonShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):
-        """base_OnEraseContents(wxDC dc)"""
+        """base_OnEraseContents(DC dc)"""
         return _ogl.PyPolygonShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):
-        """base_OnHighlight(wxDC dc)"""
+        """base_OnHighlight(DC dc)"""
         return _ogl.PyPolygonShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):
@@ -3295,13 +3492,17 @@ class PyPolygonShape(PyShape):
         return _ogl.PyPolygonShape_base_OnSize(*args, **kwargs)
 
     def base_OnMovePre(*args, **kwargs):
-        """base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
-    bool display=True) -> bool"""
+        """
+        base_OnMovePre(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(wxDC dc, double x, double y, double old_x, double old_y, 
-    bool display=True)"""
+        """
+        base_OnMovePost(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):
@@ -3329,34 +3530,40 @@ class PyPolygonShape(PyShape):
         return _ogl.PyPolygonShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):
-        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        """base_OnDrawOutline(DC dc, double x, double y, double w, double h)"""
         return _ogl.PyPolygonShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):
-        """base_OnDrawControlPoints(wxDC dc)"""
+        """base_OnDrawControlPoints(DC dc)"""
         return _ogl.PyPolygonShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):
-        """base_OnEraseControlPoints(wxDC dc)"""
+        """base_OnEraseControlPoints(DC dc)"""
         return _ogl.PyPolygonShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):
-        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        """base_OnMoveLink(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingDragLeft(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingBeginDragLeft(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+            int attachment=0)
+        """
         return _ogl.PyPolygonShape_base_OnSizingEndDragLeft(*args, **kwargs)
 
     def base_OnBeginSize(*args, **kwargs):
@@ -3376,7 +3583,6 @@ class PyPolygonShapePtr(PyPolygonShape):
 _ogl.PyPolygonShape_swigregister(PyPolygonShapePtr)
 
 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):
@@ -3396,31 +3602,31 @@ class PyTextShape(PyRectangleShape):
         return _ogl.PyTextShape_base_OnDelete(*args, **kwargs)
 
     def base_OnDraw(*args, **kwargs):
-        """base_OnDraw(wxDC dc)"""
+        """base_OnDraw(DC dc)"""
         return _ogl.PyTextShape_base_OnDraw(*args, **kwargs)
 
     def base_OnDrawContents(*args, **kwargs):
-        """base_OnDrawContents(wxDC dc)"""
+        """base_OnDrawContents(DC dc)"""
         return _ogl.PyTextShape_base_OnDrawContents(*args, **kwargs)
 
     def base_OnDrawBranches(*args, **kwargs):
-        """base_OnDrawBranches(wxDC dc, bool erase=FALSE)"""
+        """base_OnDrawBranches(DC dc, bool erase=FALSE)"""
         return _ogl.PyTextShape_base_OnDrawBranches(*args, **kwargs)
 
     def base_OnMoveLinks(*args, **kwargs):
-        """base_OnMoveLinks(wxDC dc)"""
+        """base_OnMoveLinks(DC dc)"""
         return _ogl.PyTextShape_base_OnMoveLinks(*args, **kwargs)
 
     def base_OnErase(*args, **kwargs):
-        """base_OnErase(wxDC dc)"""
+        """base_OnErase(DC dc)"""
         return _ogl.PyTextShape_base_OnErase(*args, **kwargs)
 
     def base_OnEraseContents(*args, **kwargs):
-        """base_OnEraseContents(wxDC dc)"""
+        """base_OnEraseContents(DC dc)"""
         return _ogl.PyTextShape_base_OnEraseContents(*args, **kwargs)
 
     def base_OnHighlight(*args, **kwargs):
-        """base_OnHighlight(wxDC dc)"""
+        """base_OnHighlight(DC dc)"""
         return _ogl.PyTextShape_base_OnHighlight(*args, **kwargs)
 
     def base_OnLeftClick(*args, **kwargs):
@@ -3440,13 +3646,17 @@ class PyTextShape(PyRectangleShape):
         return _ogl.PyTextShape_base_OnSize(*args, **kwargs)
 
     def base_OnMovePre(*args, **kwargs):
-        """base_OnMovePre(wxDC dc, double x, double y, double old_x, double old_y, 
-    bool display=True) -> bool"""
+        """
+        base_OnMovePre(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(wxDC dc, double x, double y, double old_x, double old_y, 
-    bool display=True)"""
+        """
+        base_OnMovePost(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):
@@ -3474,34 +3684,40 @@ class PyTextShape(PyRectangleShape):
         return _ogl.PyTextShape_base_OnEndDragRight(*args, **kwargs)
 
     def base_OnDrawOutline(*args, **kwargs):
-        """base_OnDrawOutline(wxDC dc, double x, double y, double w, double h)"""
+        """base_OnDrawOutline(DC dc, double x, double y, double w, double h)"""
         return _ogl.PyTextShape_base_OnDrawOutline(*args, **kwargs)
 
     def base_OnDrawControlPoints(*args, **kwargs):
-        """base_OnDrawControlPoints(wxDC dc)"""
+        """base_OnDrawControlPoints(DC dc)"""
         return _ogl.PyTextShape_base_OnDrawControlPoints(*args, **kwargs)
 
     def base_OnEraseControlPoints(*args, **kwargs):
-        """base_OnEraseControlPoints(wxDC dc)"""
+        """base_OnEraseControlPoints(DC dc)"""
         return _ogl.PyTextShape_base_OnEraseControlPoints(*args, **kwargs)
 
     def base_OnMoveLink(*args, **kwargs):
-        """base_OnMoveLink(wxDC dc, bool moveControlPoints=True)"""
+        """base_OnMoveLink(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingDragLeft(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingBeginDragLeft(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, 
-    int attachment=0)"""
+        """
+        base_OnSizingEndDragLeft(PyControlPoint pt, double x, double y, int keys=0, 
+            int attachment=0)
+        """
         return _ogl.PyTextShape_base_OnSizingEndDragLeft(*args, **kwargs)
 
     def base_OnBeginSize(*args, **kwargs):
@@ -3521,7 +3737,6 @@ class PyTextShapePtr(PyTextShape):
 _ogl.PyTextShape_swigregister(PyTextShapePtr)
 
 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):
@@ -3535,7 +3750,7 @@ class Diagram(core.Object):
         return _ogl.Diagram_AddShape(*args, **kwargs)
 
     def Clear(*args, **kwargs):
-        """Clear(wxDC dc)"""
+        """Clear(DC dc)"""
         return _ogl.Diagram_Clear(*args, **kwargs)
 
     def DeleteAllShapes(*args, **kwargs):
@@ -3543,7 +3758,7 @@ class Diagram(core.Object):
         return _ogl.Diagram_DeleteAllShapes(*args, **kwargs)
 
     def DrawOutline(*args, **kwargs):
-        """DrawOutline(wxDC dc, double x1, double y1, double x2, double y2)"""
+        """DrawOutline(DC dc, double x1, double y1, double x2, double y2)"""
         return _ogl.Diagram_DrawOutline(*args, **kwargs)
 
     def FindShape(*args, **kwargs):
@@ -3583,11 +3798,11 @@ class Diagram(core.Object):
         return _ogl.Diagram_InsertShape(*args, **kwargs)
 
     def RecentreAll(*args, **kwargs):
-        """RecentreAll(wxDC dc)"""
+        """RecentreAll(DC dc)"""
         return _ogl.Diagram_RecentreAll(*args, **kwargs)
 
     def Redraw(*args, **kwargs):
-        """Redraw(wxDC dc)"""
+        """Redraw(DC dc)"""
         return _ogl.Diagram_Redraw(*args, **kwargs)
 
     def RemoveAllShapes(*args, **kwargs):
@@ -3635,13 +3850,14 @@ class DiagramPtr(Diagram):
 _ogl.Diagram_swigregister(DiagramPtr)
 
 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, 
-    Size size=DefaultSize, long style=BORDER, 
-    wxString name=wxPyShapeCanvasNameStr) -> PyShapeCanvas"""
+        """
+        __init__(Window parent=None, int id=-1, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=BORDER, 
+            String name=wxPyShapeCanvasNameStr) -> PyShapeCanvas
+        """
         newobj = _ogl.new_PyShapeCanvas(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
@@ -3659,8 +3875,10 @@ class PyShapeCanvas(windows.ScrolledWindow):
         return _ogl.PyShapeCanvas_AddShape(*args, **kwargs)
 
     def FindShape(*args, **kwargs):
-        """FindShape(double x1, double y, int OUTPUT, wxClassInfo info=None, 
-    PyShape notImage=None) -> PyShape"""
+        """
+        FindShape(double x1, double y, int OUTPUT, wxClassInfo info=None, 
+            PyShape notImage=None) -> PyShape
+        """
         return _ogl.PyShapeCanvas_FindShape(*args, **kwargs)
 
     def FindFirstSensitiveShape(*args, **kwargs):
@@ -3712,7 +3930,7 @@ class PyShapeCanvas(windows.ScrolledWindow):
         return _ogl.PyShapeCanvas_base_OnRightClick(*args, **kwargs)
 
     def Redraw(*args, **kwargs):
-        """Redraw(wxDC dc)"""
+        """Redraw(DC dc)"""
         return _ogl.PyShapeCanvas_Redraw(*args, **kwargs)
 
     def RemoveShape(*args, **kwargs):