SWIG patch for "autodoc" and "docstring" %features

[wxWidgets.git] / wxPython / contrib / ogl / ogl.py

diff --git a/wxPython/contrib/ogl/ogl.py b/wxPython/contrib/ogl/ogl.py
index c9c932a09d263c4c054e41f0998edc2995d7980d..a63606915a4d89847e4a8e90b181eeb8e79d0fa7 100644 (file)
--- a/wxPython/contrib/ogl/ogl.py
+++ b/wxPython/contrib/ogl/ogl.py
@@ -1,172 +1,1263 @@
 # This file was created automatically by SWIG.
-import oglc
+# Don't modify this file, modify the SWIG interface instead.
 
-from misc import *
+import _ogl
 
-from misc2 import *
+import windows
+import core
+wx = core 
+#---------------------------------------------------------------------------
 
-from windows import *
+class ShapeRegion(core.Object):
+    def __init__(self, *args, **kwargs):
+        newobj = _ogl.new_ShapeRegion(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+    def SetText(*args, **kwargs): return _ogl.ShapeRegion_SetText(*args, **kwargs)
+    def SetFont(*args, **kwargs): return _ogl.ShapeRegion_SetFont(*args, **kwargs)
+    def SetMinSize(*args, **kwargs): return _ogl.ShapeRegion_SetMinSize(*args, **kwargs)
+    def SetSize(*args, **kwargs): return _ogl.ShapeRegion_SetSize(*args, **kwargs)
+    def SetPosition(*args, **kwargs): return _ogl.ShapeRegion_SetPosition(*args, **kwargs)
+    def SetProportions(*args, **kwargs): return _ogl.ShapeRegion_SetProportions(*args, **kwargs)
+    def SetFormatMode(*args, **kwargs): return _ogl.ShapeRegion_SetFormatMode(*args, **kwargs)
+    def SetName(*args, **kwargs): return _ogl.ShapeRegion_SetName(*args, **kwargs)
+    def SetColour(*args, **kwargs): return _ogl.ShapeRegion_SetColour(*args, **kwargs)
+    def GetText(*args, **kwargs): return _ogl.ShapeRegion_GetText(*args, **kwargs)
+    def GetFont(*args, **kwargs): return _ogl.ShapeRegion_GetFont(*args, **kwargs)
+    def GetMinSize(*args, **kwargs): return _ogl.ShapeRegion_GetMinSize(*args, **kwargs)
+    def GetProportion(*args, **kwargs): return _ogl.ShapeRegion_GetProportion(*args, **kwargs)
+    def GetSize(*args, **kwargs): return _ogl.ShapeRegion_GetSize(*args, **kwargs)
+    def GetPosition(*args, **kwargs): return _ogl.ShapeRegion_GetPosition(*args, **kwargs)
+    def GetFormatMode(*args, **kwargs): return _ogl.ShapeRegion_GetFormatMode(*args, **kwargs)
+    def GetName(*args, **kwargs): return _ogl.ShapeRegion_GetName(*args, **kwargs)
+    def GetColour(*args, **kwargs): return _ogl.ShapeRegion_GetColour(*args, **kwargs)
+    def GetActualColourObject(*args, **kwargs): return _ogl.ShapeRegion_GetActualColourObject(*args, **kwargs)
+    def GetFormattedText(*args, **kwargs): return _ogl.ShapeRegion_GetFormattedText(*args, **kwargs)
+    def GetPenColour(*args, **kwargs): return _ogl.ShapeRegion_GetPenColour(*args, **kwargs)
+    def GetPenStyle(*args, **kwargs): return _ogl.ShapeRegion_GetPenStyle(*args, **kwargs)
+    def SetPenStyle(*args, **kwargs): return _ogl.ShapeRegion_SetPenStyle(*args, **kwargs)
+    def SetPenColour(*args, **kwargs): return _ogl.ShapeRegion_SetPenColour(*args, **kwargs)
+    def GetActualPen(*args, **kwargs): return _ogl.ShapeRegion_GetActualPen(*args, **kwargs)
+    def GetWidth(*args, **kwargs): return _ogl.ShapeRegion_GetWidth(*args, **kwargs)
+    def GetHeight(*args, **kwargs): return _ogl.ShapeRegion_GetHeight(*args, **kwargs)
+    def ClearText(*args, **kwargs): return _ogl.ShapeRegion_ClearText(*args, **kwargs)
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxShapeRegion instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
-from gdi import *
+class ShapeRegionPtr(ShapeRegion):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = ShapeRegion
+_ogl.ShapeRegion_swigregister(ShapeRegionPtr)
 
-from fonts import *
+class PyShapeEvtHandler(core.Object):
+    def __init__(self, *args, **kwargs):
+        newobj = _ogl.new_PyShapeEvtHandler(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+        self._setOORandCallbackInfo(PyShapeEvtHandler)
+    def _setCallbackInfo(*args, **kwargs): return _ogl.PyShapeEvtHandler__setCallbackInfo(*args, **kwargs)
+    def _setOORInfo(*args, **kwargs): return _ogl.PyShapeEvtHandler__setOORInfo(*args, **kwargs)
+    def _setOORandCallbackInfo(self, _class):
+        self._setOORInfo(self)
+        self._setCallbackInfo(self, _class)
 
-from clip_dnd import *
+    def SetShape(*args, **kwargs): return _ogl.PyShapeEvtHandler_SetShape(*args, **kwargs)
+    def GetShape(*args, **kwargs): return _ogl.PyShapeEvtHandler_GetShape(*args, **kwargs)
+    def SetPreviousHandler(*args, **kwargs): return _ogl.PyShapeEvtHandler_SetPreviousHandler(*args, **kwargs)
+    def GetPreviousHandler(*args, **kwargs): return _ogl.PyShapeEvtHandler_GetPreviousHandler(*args, **kwargs)
+    def CreateNewCopy(*args, **kwargs): return _ogl.PyShapeEvtHandler_CreateNewCopy(*args, **kwargs)
+    def base_OnDelete(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnDelete(*args, **kwargs)
+    def base_OnDraw(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnDraw(*args, **kwargs)
+    def base_OnDrawContents(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnDrawContents(*args, **kwargs)
+    def base_OnDrawBranches(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnDrawBranches(*args, **kwargs)
+    def base_OnMoveLinks(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnMoveLinks(*args, **kwargs)
+    def base_OnErase(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnErase(*args, **kwargs)
+    def base_OnEraseContents(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnEraseContents(*args, **kwargs)
+    def base_OnHighlight(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnHighlight(*args, **kwargs)
+    def base_OnLeftClick(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnLeftClick(*args, **kwargs)
+    def base_OnLeftDoubleClick(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnLeftDoubleClick(*args, **kwargs)
+    def base_OnRightClick(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnRightClick(*args, **kwargs)
+    def base_OnSize(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnSize(*args, **kwargs)
+    def base_OnMovePre(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnMovePre(*args, **kwargs)
+    def base_OnMovePost(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnMovePost(*args, **kwargs)
+    def base_OnDragLeft(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnDragLeft(*args, **kwargs)
+    def base_OnBeginDragLeft(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnBeginDragLeft(*args, **kwargs)
+    def base_OnEndDragLeft(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnEndDragLeft(*args, **kwargs)
+    def base_OnDragRight(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnDragRight(*args, **kwargs)
+    def base_OnBeginDragRight(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnBeginDragRight(*args, **kwargs)
+    def base_OnEndDragRight(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnEndDragRight(*args, **kwargs)
+    def base_OnDrawOutline(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnDrawOutline(*args, **kwargs)
+    def base_OnDrawControlPoints(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnDrawControlPoints(*args, **kwargs)
+    def base_OnEraseControlPoints(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnEraseControlPoints(*args, **kwargs)
+    def base_OnMoveLink(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnMoveLink(*args, **kwargs)
+    def base_OnSizingDragLeft(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnSizingDragLeft(*args, **kwargs)
+    def base_OnSizingBeginDragLeft(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnSizingBeginDragLeft(*args, **kwargs)
+    def base_OnSizingEndDragLeft(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnSizingEndDragLeft(*args, **kwargs)
+    def base_OnBeginSize(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnBeginSize(*args, **kwargs)
+    def base_OnEndSize(*args, **kwargs): return _ogl.PyShapeEvtHandler_base_OnEndSize(*args, **kwargs)
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyShapeEvtHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
-from events import *
+class PyShapeEvtHandlerPtr(PyShapeEvtHandler):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = PyShapeEvtHandler
+_ogl.PyShapeEvtHandler_swigregister(PyShapeEvtHandlerPtr)
 
-from streams import *
+class PyShape(PyShapeEvtHandler):
+    def __init__(self, *args, **kwargs):
+        newobj = _ogl.new_PyShape(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+        self._setOORandCallbackInfo(PyShapeEvtHandler)
+    def _setCallbackInfo(*args, **kwargs): return _ogl.PyShape__setCallbackInfo(*args, **kwargs)
+    def GetBoundingBoxMax(*args, **kwargs): return _ogl.PyShape_GetBoundingBoxMax(*args, **kwargs)
+    def GetBoundingBoxMin(*args, **kwargs): return _ogl.PyShape_GetBoundingBoxMin(*args, **kwargs)
+    def GetPerimeterPoint(*args, **kwargs): return _ogl.PyShape_GetPerimeterPoint(*args, **kwargs)
+    def GetCanvas(*args, **kwargs): return _ogl.PyShape_GetCanvas(*args, **kwargs)
+    def SetCanvas(*args, **kwargs): return _ogl.PyShape_SetCanvas(*args, **kwargs)
+    def AddToCanvas(*args, **kwargs): return _ogl.PyShape_AddToCanvas(*args, **kwargs)
+    def InsertInCanvas(*args, **kwargs): return _ogl.PyShape_InsertInCanvas(*args, **kwargs)
+    def RemoveFromCanvas(*args, **kwargs): return _ogl.PyShape_RemoveFromCanvas(*args, **kwargs)
+    def GetX(*args, **kwargs): return _ogl.PyShape_GetX(*args, **kwargs)
+    def GetY(*args, **kwargs): return _ogl.PyShape_GetY(*args, **kwargs)
+    def SetX(*args, **kwargs): return _ogl.PyShape_SetX(*args, **kwargs)
+    def SetY(*args, **kwargs): return _ogl.PyShape_SetY(*args, **kwargs)
+    def GetParent(*args, **kwargs): return _ogl.PyShape_GetParent(*args, **kwargs)
+    def SetParent(*args, **kwargs): return _ogl.PyShape_SetParent(*args, **kwargs)
+    def GetTopAncestor(*args, **kwargs): return _ogl.PyShape_GetTopAncestor(*args, **kwargs)
+    def GetChildren(*args, **kwargs): return _ogl.PyShape_GetChildren(*args, **kwargs)
+    def Unlink(*args, **kwargs): return _ogl.PyShape_Unlink(*args, **kwargs)
+    def SetDrawHandles(*args, **kwargs): return _ogl.PyShape_SetDrawHandles(*args, **kwargs)
+    def GetDrawHandles(*args, **kwargs): return _ogl.PyShape_GetDrawHandles(*args, **kwargs)
+    def MakeControlPoints(*args, **kwargs): return _ogl.PyShape_MakeControlPoints(*args, **kwargs)
+    def DeleteControlPoints(*args, **kwargs): return _ogl.PyShape_DeleteControlPoints(*args, **kwargs)
+    def ResetControlPoints(*args, **kwargs): return _ogl.PyShape_ResetControlPoints(*args, **kwargs)
+    def GetEventHandler(*args, **kwargs): return _ogl.PyShape_GetEventHandler(*args, **kwargs)
+    def SetEventHandler(*args, **kwargs): return _ogl.PyShape_SetEventHandler(*args, **kwargs)
+    def MakeMandatoryControlPoints(*args, **kwargs): return _ogl.PyShape_MakeMandatoryControlPoints(*args, **kwargs)
+    def ResetMandatoryControlPoints(*args, **kwargs): return _ogl.PyShape_ResetMandatoryControlPoints(*args, **kwargs)
+    def Recompute(*args, **kwargs): return _ogl.PyShape_Recompute(*args, **kwargs)
+    def CalculateSize(*args, **kwargs): return _ogl.PyShape_CalculateSize(*args, **kwargs)
+    def Select(*args, **kwargs): return _ogl.PyShape_Select(*args, **kwargs)
+    def SetHighlight(*args, **kwargs): return _ogl.PyShape_SetHighlight(*args, **kwargs)
+    def IsHighlighted(*args, **kwargs): return _ogl.PyShape_IsHighlighted(*args, **kwargs)
+    def Selected(*args, **kwargs): return _ogl.PyShape_Selected(*args, **kwargs)
+    def AncestorSelected(*args, **kwargs): return _ogl.PyShape_AncestorSelected(*args, **kwargs)
+    def SetSensitivityFilter(*args, **kwargs): return _ogl.PyShape_SetSensitivityFilter(*args, **kwargs)
+    def GetSensitivityFilter(*args, **kwargs): return _ogl.PyShape_GetSensitivityFilter(*args, **kwargs)
+    def SetDraggable(*args, **kwargs): return _ogl.PyShape_SetDraggable(*args, **kwargs)
+    def SetFixedSize(*args, **kwargs): return _ogl.PyShape_SetFixedSize(*args, **kwargs)
+    def GetFixedSize(*args, **kwargs): return _ogl.PyShape_GetFixedSize(*args, **kwargs)
+    def GetFixedWidth(*args, **kwargs): return _ogl.PyShape_GetFixedWidth(*args, **kwargs)
+    def GetFixedHeight(*args, **kwargs): return _ogl.PyShape_GetFixedHeight(*args, **kwargs)
+    def SetSpaceAttachments(*args, **kwargs): return _ogl.PyShape_SetSpaceAttachments(*args, **kwargs)
+    def GetSpaceAttachments(*args, **kwargs): return _ogl.PyShape_GetSpaceAttachments(*args, **kwargs)
+    def SetShadowMode(*args, **kwargs): return _ogl.PyShape_SetShadowMode(*args, **kwargs)
+    def GetShadowMode(*args, **kwargs): return _ogl.PyShape_GetShadowMode(*args, **kwargs)
+    def HitTest(*args, **kwargs): return _ogl.PyShape_HitTest(*args, **kwargs)
+    def SetCentreResize(*args, **kwargs): return _ogl.PyShape_SetCentreResize(*args, **kwargs)
+    def GetCentreResize(*args, **kwargs): return _ogl.PyShape_GetCentreResize(*args, **kwargs)
+    def SetMaintainAspectRatio(*args, **kwargs): return _ogl.PyShape_SetMaintainAspectRatio(*args, **kwargs)
+    def GetMaintainAspectRatio(*args, **kwargs): return _ogl.PyShape_GetMaintainAspectRatio(*args, **kwargs)
+    def GetLines(*args, **kwargs): return _ogl.PyShape_GetLines(*args, **kwargs)
+    def SetDisableLabel(*args, **kwargs): return _ogl.PyShape_SetDisableLabel(*args, **kwargs)
+    def GetDisableLabel(*args, **kwargs): return _ogl.PyShape_GetDisableLabel(*args, **kwargs)
+    def SetAttachmentMode(*args, **kwargs): return _ogl.PyShape_SetAttachmentMode(*args, **kwargs)
+    def GetAttachmentMode(*args, **kwargs): return _ogl.PyShape_GetAttachmentMode(*args, **kwargs)
+    def SetId(*args, **kwargs): return _ogl.PyShape_SetId(*args, **kwargs)
+    def GetId(*args, **kwargs): return _ogl.PyShape_GetId(*args, **kwargs)
+    def SetPen(*args, **kwargs): return _ogl.PyShape_SetPen(*args, **kwargs)
+    def SetBrush(*args, **kwargs): return _ogl.PyShape_SetBrush(*args, **kwargs)
+    def SetClientData(self, data):
+        self.clientData = data
+    def GetClientData(self):
+        if hasattr(self, 'clientData'):
+            return self.clientData
+        else:
+            return None
 
-from utils import *
+    def Show(*args, **kwargs): return _ogl.PyShape_Show(*args, **kwargs)
+    def IsShown(*args, **kwargs): return _ogl.PyShape_IsShown(*args, **kwargs)
+    def Move(*args, **kwargs): return _ogl.PyShape_Move(*args, **kwargs)
+    def Erase(*args, **kwargs): return _ogl.PyShape_Erase(*args, **kwargs)
+    def EraseContents(*args, **kwargs): return _ogl.PyShape_EraseContents(*args, **kwargs)
+    def Draw(*args, **kwargs): return _ogl.PyShape_Draw(*args, **kwargs)
+    def Flash(*args, **kwargs): return _ogl.PyShape_Flash(*args, **kwargs)
+    def MoveLinks(*args, **kwargs): return _ogl.PyShape_MoveLinks(*args, **kwargs)
+    def DrawContents(*args, **kwargs): return _ogl.PyShape_DrawContents(*args, **kwargs)
+    def SetSize(*args, **kwargs): return _ogl.PyShape_SetSize(*args, **kwargs)
+    def SetAttachmentSize(*args, **kwargs): return _ogl.PyShape_SetAttachmentSize(*args, **kwargs)
+    def Attach(*args, **kwargs): return _ogl.PyShape_Attach(*args, **kwargs)
+    def Detach(*args, **kwargs): return _ogl.PyShape_Detach(*args, **kwargs)
+    def Constrain(*args, **kwargs): return _ogl.PyShape_Constrain(*args, **kwargs)
+    def AddLine(*args, **kwargs): return _ogl.PyShape_AddLine(*args, **kwargs)
+    def GetLinePosition(*args, **kwargs): return _ogl.PyShape_GetLinePosition(*args, **kwargs)
+    def AddText(*args, **kwargs): return _ogl.PyShape_AddText(*args, **kwargs)
+    def GetPen(*args, **kwargs): return _ogl.PyShape_GetPen(*args, **kwargs)
+    def GetBrush(*args, **kwargs): return _ogl.PyShape_GetBrush(*args, **kwargs)
+    def SetDefaultRegionSize(*args, **kwargs): return _ogl.PyShape_SetDefaultRegionSize(*args, **kwargs)
+    def FormatText(*args, **kwargs): return _ogl.PyShape_FormatText(*args, **kwargs)
+    def SetFormatMode(*args, **kwargs): return _ogl.PyShape_SetFormatMode(*args, **kwargs)
+    def GetFormatMode(*args, **kwargs): return _ogl.PyShape_GetFormatMode(*args, **kwargs)
+    def SetFont(*args, **kwargs): return _ogl.PyShape_SetFont(*args, **kwargs)
+    def GetFont(*args, **kwargs): return _ogl.PyShape_GetFont(*args, **kwargs)
+    def SetTextColour(*args, **kwargs): return _ogl.PyShape_SetTextColour(*args, **kwargs)
+    def GetTextColour(*args, **kwargs): return _ogl.PyShape_GetTextColour(*args, **kwargs)
+    def GetNumberOfTextRegions(*args, **kwargs): return _ogl.PyShape_GetNumberOfTextRegions(*args, **kwargs)
+    def SetRegionName(*args, **kwargs): return _ogl.PyShape_SetRegionName(*args, **kwargs)
+    def GetRegionName(*args, **kwargs): return _ogl.PyShape_GetRegionName(*args, **kwargs)
+    def GetRegionId(*args, **kwargs): return _ogl.PyShape_GetRegionId(*args, **kwargs)
+    def NameRegions(*args, **kwargs): return _ogl.PyShape_NameRegions(*args, **kwargs)
+    def GetRegions(*args, **kwargs): return _ogl.PyShape_GetRegions(*args, **kwargs)
+    def AddRegion(*args, **kwargs): return _ogl.PyShape_AddRegion(*args, **kwargs)
+    def ClearRegions(*args, **kwargs): return _ogl.PyShape_ClearRegions(*args, **kwargs)
+    def AssignNewIds(*args, **kwargs): return _ogl.PyShape_AssignNewIds(*args, **kwargs)
+    def FindRegion(*args, **kwargs): return _ogl.PyShape_FindRegion(*args, **kwargs)
+    def FindRegionNames(*args, **kwargs): return _ogl.PyShape_FindRegionNames(*args, **kwargs)
+    def ClearText(*args, **kwargs): return _ogl.PyShape_ClearText(*args, **kwargs)
+    def RemoveLine(*args, **kwargs): return _ogl.PyShape_RemoveLine(*args, **kwargs)
+    def GetAttachmentPosition(*args, **kwargs): return _ogl.PyShape_GetAttachmentPosition(*args, **kwargs)
+    def GetNumberOfAttachments(*args, **kwargs): return _ogl.PyShape_GetNumberOfAttachments(*args, **kwargs)
+    def AttachmentIsValid(*args, **kwargs): return _ogl.PyShape_AttachmentIsValid(*args, **kwargs)
+    def GetAttachmentPositionEdge(*args, **kwargs): return _ogl.PyShape_GetAttachmentPositionEdge(*args, **kwargs)
+    def CalcSimpleAttachment(*args, **kwargs): return _ogl.PyShape_CalcSimpleAttachment(*args, **kwargs)
+    def AttachmentSortTest(*args, **kwargs): return _ogl.PyShape_AttachmentSortTest(*args, **kwargs)
+    def EraseLinks(*args, **kwargs): return _ogl.PyShape_EraseLinks(*args, **kwargs)
+    def DrawLinks(*args, **kwargs): return _ogl.PyShape_DrawLinks(*args, **kwargs)
+    def MoveLineToNewAttachment(*args, **kwargs): return _ogl.PyShape_MoveLineToNewAttachment(*args, **kwargs)
+    def ApplyAttachmentOrdering(*args, **kwargs): return _ogl.PyShape_ApplyAttachmentOrdering(*args, **kwargs)
+    def GetBranchingAttachmentRoot(*args, **kwargs): return _ogl.PyShape_GetBranchingAttachmentRoot(*args, **kwargs)
+    def GetBranchingAttachmentInfo(*args, **kwargs): return _ogl.PyShape_GetBranchingAttachmentInfo(*args, **kwargs)
+    def GetBranchingAttachmentPoint(*args, **kwargs): return _ogl.PyShape_GetBranchingAttachmentPoint(*args, **kwargs)
+    def GetAttachmentLineCount(*args, **kwargs): return _ogl.PyShape_GetAttachmentLineCount(*args, **kwargs)
+    def SetBranchNeckLength(*args, **kwargs): return _ogl.PyShape_SetBranchNeckLength(*args, **kwargs)
+    def GetBranchNeckLength(*args, **kwargs): return _ogl.PyShape_GetBranchNeckLength(*args, **kwargs)
+    def SetBranchStemLength(*args, **kwargs): return _ogl.PyShape_SetBranchStemLength(*args, **kwargs)
+    def GetBranchStemLength(*args, **kwargs): return _ogl.PyShape_GetBranchStemLength(*args, **kwargs)
+    def SetBranchSpacing(*args, **kwargs): return _ogl.PyShape_SetBranchSpacing(*args, **kwargs)
+    def GetBranchSpacing(*args, **kwargs): return _ogl.PyShape_GetBranchSpacing(*args, **kwargs)
+    def SetBranchStyle(*args, **kwargs): return _ogl.PyShape_SetBranchStyle(*args, **kwargs)
+    def GetBranchStyle(*args, **kwargs): return _ogl.PyShape_GetBranchStyle(*args, **kwargs)
+    def PhysicalToLogicalAttachment(*args, **kwargs): return _ogl.PyShape_PhysicalToLogicalAttachment(*args, **kwargs)
+    def LogicalToPhysicalAttachment(*args, **kwargs): return _ogl.PyShape_LogicalToPhysicalAttachment(*args, **kwargs)
+    def Draggable(*args, **kwargs): return _ogl.PyShape_Draggable(*args, **kwargs)
+    def HasDescendant(*args, **kwargs): return _ogl.PyShape_HasDescendant(*args, **kwargs)
+    def CreateNewCopy(*args, **kwargs): return _ogl.PyShape_CreateNewCopy(*args, **kwargs)
+    def Copy(*args, **kwargs): return _ogl.PyShape_Copy(*args, **kwargs)
+    def CopyWithHandler(*args, **kwargs): return _ogl.PyShape_CopyWithHandler(*args, **kwargs)
+    def Rotate(*args, **kwargs): return _ogl.PyShape_Rotate(*args, **kwargs)
+    def GetRotation(*args, **kwargs): return _ogl.PyShape_GetRotation(*args, **kwargs)
+    def ClearAttachments(*args, **kwargs): return _ogl.PyShape_ClearAttachments(*args, **kwargs)
+    def Recentre(*args, **kwargs): return _ogl.PyShape_Recentre(*args, **kwargs)
+    def ClearPointList(*args, **kwargs): return _ogl.PyShape_ClearPointList(*args, **kwargs)
+    def GetBackgroundPen(*args, **kwargs): return _ogl.PyShape_GetBackgroundPen(*args, **kwargs)
+    def GetBackgroundBrush(*args, **kwargs): return _ogl.PyShape_GetBackgroundBrush(*args, **kwargs)
+    def base_OnDelete(*args, **kwargs): return _ogl.PyShape_base_OnDelete(*args, **kwargs)
+    def base_OnDraw(*args, **kwargs): return _ogl.PyShape_base_OnDraw(*args, **kwargs)
+    def base_OnDrawContents(*args, **kwargs): return _ogl.PyShape_base_OnDrawContents(*args, **kwargs)
+    def base_OnDrawBranches(*args, **kwargs): return _ogl.PyShape_base_OnDrawBranches(*args, **kwargs)
+    def base_OnMoveLinks(*args, **kwargs): return _ogl.PyShape_base_OnMoveLinks(*args, **kwargs)
+    def base_OnErase(*args, **kwargs): return _ogl.PyShape_base_OnErase(*args, **kwargs)
+    def base_OnEraseContents(*args, **kwargs): return _ogl.PyShape_base_OnEraseContents(*args, **kwargs)
+    def base_OnHighlight(*args, **kwargs): return _ogl.PyShape_base_OnHighlight(*args, **kwargs)
+    def base_OnLeftClick(*args, **kwargs): return _ogl.PyShape_base_OnLeftClick(*args, **kwargs)
+    def base_OnLeftDoubleClick(*args, **kwargs): return _ogl.PyShape_base_OnLeftDoubleClick(*args, **kwargs)
+    def base_OnRightClick(*args, **kwargs): return _ogl.PyShape_base_OnRightClick(*args, **kwargs)
+    def base_OnSize(*args, **kwargs): return _ogl.PyShape_base_OnSize(*args, **kwargs)
+    def base_OnMovePre(*args, **kwargs): return _ogl.PyShape_base_OnMovePre(*args, **kwargs)
+    def base_OnMovePost(*args, **kwargs): return _ogl.PyShape_base_OnMovePost(*args, **kwargs)
+    def base_OnDragLeft(*args, **kwargs): return _ogl.PyShape_base_OnDragLeft(*args, **kwargs)
+    def base_OnBeginDragLeft(*args, **kwargs): return _ogl.PyShape_base_OnBeginDragLeft(*args, **kwargs)
+    def base_OnEndDragLeft(*args, **kwargs): return _ogl.PyShape_base_OnEndDragLeft(*args, **kwargs)
+    def base_OnDragRight(*args, **kwargs): return _ogl.PyShape_base_OnDragRight(*args, **kwargs)
+    def base_OnBeginDragRight(*args, **kwargs): return _ogl.PyShape_base_OnBeginDragRight(*args, **kwargs)
+    def base_OnEndDragRight(*args, **kwargs): return _ogl.PyShape_base_OnEndDragRight(*args, **kwargs)
+    def base_OnDrawOutline(*args, **kwargs): return _ogl.PyShape_base_OnDrawOutline(*args, **kwargs)
+    def base_OnDrawControlPoints(*args, **kwargs): return _ogl.PyShape_base_OnDrawControlPoints(*args, **kwargs)
+    def base_OnEraseControlPoints(*args, **kwargs): return _ogl.PyShape_base_OnEraseControlPoints(*args, **kwargs)
+    def base_OnMoveLink(*args, **kwargs): return _ogl.PyShape_base_OnMoveLink(*args, **kwargs)
+    def base_OnSizingDragLeft(*args, **kwargs): return _ogl.PyShape_base_OnSizingDragLeft(*args, **kwargs)
+    def base_OnSizingBeginDragLeft(*args, **kwargs): return _ogl.PyShape_base_OnSizingBeginDragLeft(*args, **kwargs)
+    def base_OnSizingEndDragLeft(*args, **kwargs): return _ogl.PyShape_base_OnSizingEndDragLeft(*args, **kwargs)
+    def base_OnBeginSize(*args, **kwargs): return _ogl.PyShape_base_OnBeginSize(*args, **kwargs)
+    def base_OnEndSize(*args, **kwargs): return _ogl.PyShape_base_OnEndSize(*args, **kwargs)
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
-from mdi import *
+class PyShapePtr(PyShape):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = PyShape
+_ogl.PyShape_swigregister(PyShapePtr)
 
-from frames import *
+oglMETAFLAGS_OUTLINE = _ogl.oglMETAFLAGS_OUTLINE
+oglMETAFLAGS_ATTACHMENTS = _ogl.oglMETAFLAGS_ATTACHMENTS
+class PseudoMetaFile(core.Object):
+    def __init__(self, *args, **kwargs):
+        newobj = _ogl.new_PseudoMetaFile(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+    def __del__(self, destroy=_ogl.delete_PseudoMetaFile):
+        try:
+            if self.thisown: destroy(self)
+        except: pass
+    def Draw(*args, **kwargs): return _ogl.PseudoMetaFile_Draw(*args, **kwargs)
+    def Clear(*args, **kwargs): return _ogl.PseudoMetaFile_Clear(*args, **kwargs)
+    def Copy(*args, **kwargs): return _ogl.PseudoMetaFile_Copy(*args, **kwargs)
+    def Scale(*args, **kwargs): return _ogl.PseudoMetaFile_Scale(*args, **kwargs)
+    def ScaleTo(*args, **kwargs): return _ogl.PseudoMetaFile_ScaleTo(*args, **kwargs)
+    def Translate(*args, **kwargs): return _ogl.PseudoMetaFile_Translate(*args, **kwargs)
+    def Rotate(*args, **kwargs): return _ogl.PseudoMetaFile_Rotate(*args, **kwargs)
+    def LoadFromMetaFile(*args, **kwargs): return _ogl.PseudoMetaFile_LoadFromMetaFile(*args, **kwargs)
+    def GetBounds(*args, **kwargs): return _ogl.PseudoMetaFile_GetBounds(*args, **kwargs)
+    def CalculateSize(*args, **kwargs): return _ogl.PseudoMetaFile_CalculateSize(*args, **kwargs)
+    def SetRotateable(*args, **kwargs): return _ogl.PseudoMetaFile_SetRotateable(*args, **kwargs)
+    def GetRotateable(*args, **kwargs): return _ogl.PseudoMetaFile_GetRotateable(*args, **kwargs)
+    def SetSize(*args, **kwargs): return _ogl.PseudoMetaFile_SetSize(*args, **kwargs)
+    def SetFillBrush(*args, **kwargs): return _ogl.PseudoMetaFile_SetFillBrush(*args, **kwargs)
+    def GetFillBrush(*args, **kwargs): return _ogl.PseudoMetaFile_GetFillBrush(*args, **kwargs)
+    def SetOutlinePen(*args, **kwargs): return _ogl.PseudoMetaFile_SetOutlinePen(*args, **kwargs)
+    def GetOutlinePen(*args, **kwargs): return _ogl.PseudoMetaFile_GetOutlinePen(*args, **kwargs)
+    def SetOutlineOp(*args, **kwargs): return _ogl.PseudoMetaFile_SetOutlineOp(*args, **kwargs)
+    def GetOutlineOp(*args, **kwargs): return _ogl.PseudoMetaFile_GetOutlineOp(*args, **kwargs)
+    def IsValid(*args, **kwargs): return _ogl.PseudoMetaFile_IsValid(*args, **kwargs)
+    def DrawLine(*args, **kwargs): return _ogl.PseudoMetaFile_DrawLine(*args, **kwargs)
+    def DrawRectangle(*args, **kwargs): return _ogl.PseudoMetaFile_DrawRectangle(*args, **kwargs)
+    def DrawRoundedRectangle(*args, **kwargs): return _ogl.PseudoMetaFile_DrawRoundedRectangle(*args, **kwargs)
+    def DrawArc(*args, **kwargs): return _ogl.PseudoMetaFile_DrawArc(*args, **kwargs)
+    def DrawEllipticArc(*args, **kwargs): return _ogl.PseudoMetaFile_DrawEllipticArc(*args, **kwargs)
+    def DrawEllipse(*args, **kwargs): return _ogl.PseudoMetaFile_DrawEllipse(*args, **kwargs)
+    def DrawPoint(*args, **kwargs): return _ogl.PseudoMetaFile_DrawPoint(*args, **kwargs)
+    def DrawText(*args, **kwargs): return _ogl.PseudoMetaFile_DrawText(*args, **kwargs)
+    def DrawLines(*args, **kwargs): return _ogl.PseudoMetaFile_DrawLines(*args, **kwargs)
+    def DrawPolygon(*args, **kwargs): return _ogl.PseudoMetaFile_DrawPolygon(*args, **kwargs)
+    def DrawSpline(*args, **kwargs): return _ogl.PseudoMetaFile_DrawSpline(*args, **kwargs)
+    def SetClippingRect(*args, **kwargs): return _ogl.PseudoMetaFile_SetClippingRect(*args, **kwargs)
+    def DestroyClippingRect(*args, **kwargs): return _ogl.PseudoMetaFile_DestroyClippingRect(*args, **kwargs)
+    def SetPen(*args, **kwargs): return _ogl.PseudoMetaFile_SetPen(*args, **kwargs)
+    def SetBrush(*args, **kwargs): return _ogl.PseudoMetaFile_SetBrush(*args, **kwargs)
+    def SetFont(*args, **kwargs): return _ogl.PseudoMetaFile_SetFont(*args, **kwargs)
+    def SetTextColour(*args, **kwargs): return _ogl.PseudoMetaFile_SetTextColour(*args, **kwargs)
+    def SetBackgroundColour(*args, **kwargs): return _ogl.PseudoMetaFile_SetBackgroundColour(*args, **kwargs)
+    def SetBackgroundMode(*args, **kwargs): return _ogl.PseudoMetaFile_SetBackgroundMode(*args, **kwargs)
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPseudoMetaFile instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
-from stattool import *
+class PseudoMetaFilePtr(PseudoMetaFile):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = PseudoMetaFile
+_ogl.PseudoMetaFile_swigregister(PseudoMetaFilePtr)
 
-from controls import *
+class PyRectangleShape(PyShape):
+    def __init__(self, *args, **kwargs):
+        newobj = _ogl.new_PyRectangleShape(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+        self._setOORandCallbackInfo(PyRectangleShape)
+    def _setCallbackInfo(*args, **kwargs): return _ogl.PyRectangleShape__setCallbackInfo(*args, **kwargs)
+    def SetCornerRadius(*args, **kwargs): return _ogl.PyRectangleShape_SetCornerRadius(*args, **kwargs)
+    def base_OnDelete(*args, **kwargs): return _ogl.PyRectangleShape_base_OnDelete(*args, **kwargs)
+    def base_OnDraw(*args, **kwargs): return _ogl.PyRectangleShape_base_OnDraw(*args, **kwargs)
+    def base_OnDrawContents(*args, **kwargs): return _ogl.PyRectangleShape_base_OnDrawContents(*args, **kwargs)
+    def base_OnDrawBranches(*args, **kwargs): return _ogl.PyRectangleShape_base_OnDrawBranches(*args, **kwargs)
+    def base_OnMoveLinks(*args, **kwargs): return _ogl.PyRectangleShape_base_OnMoveLinks(*args, **kwargs)
+    def base_OnErase(*args, **kwargs): return _ogl.PyRectangleShape_base_OnErase(*args, **kwargs)
+    def base_OnEraseContents(*args, **kwargs): return _ogl.PyRectangleShape_base_OnEraseContents(*args, **kwargs)
+    def base_OnHighlight(*args, **kwargs): return _ogl.PyRectangleShape_base_OnHighlight(*args, **kwargs)
+    def base_OnLeftClick(*args, **kwargs): return _ogl.PyRectangleShape_base_OnLeftClick(*args, **kwargs)
+    def base_OnLeftDoubleClick(*args, **kwargs): return _ogl.PyRectangleShape_base_OnLeftDoubleClick(*args, **kwargs)
+    def base_OnRightClick(*args, **kwargs): return _ogl.PyRectangleShape_base_OnRightClick(*args, **kwargs)
+    def base_OnSize(*args, **kwargs): return _ogl.PyRectangleShape_base_OnSize(*args, **kwargs)
+    def base_OnMovePre(*args, **kwargs): return _ogl.PyRectangleShape_base_OnMovePre(*args, **kwargs)
+    def base_OnMovePost(*args, **kwargs): return _ogl.PyRectangleShape_base_OnMovePost(*args, **kwargs)
+    def base_OnDragLeft(*args, **kwargs): return _ogl.PyRectangleShape_base_OnDragLeft(*args, **kwargs)
+    def base_OnBeginDragLeft(*args, **kwargs): return _ogl.PyRectangleShape_base_OnBeginDragLeft(*args, **kwargs)
+    def base_OnEndDragLeft(*args, **kwargs): return _ogl.PyRectangleShape_base_OnEndDragLeft(*args, **kwargs)
+    def base_OnDragRight(*args, **kwargs): return _ogl.PyRectangleShape_base_OnDragRight(*args, **kwargs)
+    def base_OnBeginDragRight(*args, **kwargs): return _ogl.PyRectangleShape_base_OnBeginDragRight(*args, **kwargs)
+    def base_OnEndDragRight(*args, **kwargs): return _ogl.PyRectangleShape_base_OnEndDragRight(*args, **kwargs)
+    def base_OnDrawOutline(*args, **kwargs): return _ogl.PyRectangleShape_base_OnDrawOutline(*args, **kwargs)
+    def base_OnDrawControlPoints(*args, **kwargs): return _ogl.PyRectangleShape_base_OnDrawControlPoints(*args, **kwargs)
+    def base_OnEraseControlPoints(*args, **kwargs): return _ogl.PyRectangleShape_base_OnEraseControlPoints(*args, **kwargs)
+    def base_OnMoveLink(*args, **kwargs): return _ogl.PyRectangleShape_base_OnMoveLink(*args, **kwargs)
+    def base_OnSizingDragLeft(*args, **kwargs): return _ogl.PyRectangleShape_base_OnSizingDragLeft(*args, **kwargs)
+    def base_OnSizingBeginDragLeft(*args, **kwargs): return _ogl.PyRectangleShape_base_OnSizingBeginDragLeft(*args, **kwargs)
+    def base_OnSizingEndDragLeft(*args, **kwargs): return _ogl.PyRectangleShape_base_OnSizingEndDragLeft(*args, **kwargs)
+    def base_OnBeginSize(*args, **kwargs): return _ogl.PyRectangleShape_base_OnBeginSize(*args, **kwargs)
+    def base_OnEndSize(*args, **kwargs): return _ogl.PyRectangleShape_base_OnEndSize(*args, **kwargs)
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyRectangleShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
-from controls2 import *
+class PyRectangleShapePtr(PyRectangleShape):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = PyRectangleShape
+_ogl.PyRectangleShape_swigregister(PyRectangleShapePtr)
 
-from windows2 import *
+class PyControlPoint(PyRectangleShape):
+    def __init__(self, *args, **kwargs):
+        newobj = _ogl.new_PyControlPoint(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+        self._setOORandCallbackInfo(PyControlPoint)
+    def _setCallbackInfo(*args, **kwargs): return _ogl.PyControlPoint__setCallbackInfo(*args, **kwargs)
+    def SetCornerRadius(*args, **kwargs): return _ogl.PyControlPoint_SetCornerRadius(*args, **kwargs)
+    def base_OnDelete(*args, **kwargs): return _ogl.PyControlPoint_base_OnDelete(*args, **kwargs)
+    def base_OnDraw(*args, **kwargs): return _ogl.PyControlPoint_base_OnDraw(*args, **kwargs)
+    def base_OnDrawContents(*args, **kwargs): return _ogl.PyControlPoint_base_OnDrawContents(*args, **kwargs)
+    def base_OnDrawBranches(*args, **kwargs): return _ogl.PyControlPoint_base_OnDrawBranches(*args, **kwargs)
+    def base_OnMoveLinks(*args, **kwargs): return _ogl.PyControlPoint_base_OnMoveLinks(*args, **kwargs)
+    def base_OnErase(*args, **kwargs): return _ogl.PyControlPoint_base_OnErase(*args, **kwargs)
+    def base_OnEraseContents(*args, **kwargs): return _ogl.PyControlPoint_base_OnEraseContents(*args, **kwargs)
+    def base_OnHighlight(*args, **kwargs): return _ogl.PyControlPoint_base_OnHighlight(*args, **kwargs)
+    def base_OnLeftClick(*args, **kwargs): return _ogl.PyControlPoint_base_OnLeftClick(*args, **kwargs)
+    def base_OnLeftDoubleClick(*args, **kwargs): return _ogl.PyControlPoint_base_OnLeftDoubleClick(*args, **kwargs)
+    def base_OnRightClick(*args, **kwargs): return _ogl.PyControlPoint_base_OnRightClick(*args, **kwargs)
+    def base_OnSize(*args, **kwargs): return _ogl.PyControlPoint_base_OnSize(*args, **kwargs)
+    def base_OnMovePre(*args, **kwargs): return _ogl.PyControlPoint_base_OnMovePre(*args, **kwargs)
+    def base_OnMovePost(*args, **kwargs): return _ogl.PyControlPoint_base_OnMovePost(*args, **kwargs)
+    def base_OnDragLeft(*args, **kwargs): return _ogl.PyControlPoint_base_OnDragLeft(*args, **kwargs)
+    def base_OnBeginDragLeft(*args, **kwargs): return _ogl.PyControlPoint_base_OnBeginDragLeft(*args, **kwargs)
+    def base_OnEndDragLeft(*args, **kwargs): return _ogl.PyControlPoint_base_OnEndDragLeft(*args, **kwargs)
+    def base_OnDragRight(*args, **kwargs): return _ogl.PyControlPoint_base_OnDragRight(*args, **kwargs)
+    def base_OnBeginDragRight(*args, **kwargs): return _ogl.PyControlPoint_base_OnBeginDragRight(*args, **kwargs)
+    def base_OnEndDragRight(*args, **kwargs): return _ogl.PyControlPoint_base_OnEndDragRight(*args, **kwargs)
+    def base_OnDrawOutline(*args, **kwargs): return _ogl.PyControlPoint_base_OnDrawOutline(*args, **kwargs)
+    def base_OnDrawControlPoints(*args, **kwargs): return _ogl.PyControlPoint_base_OnDrawControlPoints(*args, **kwargs)
+    def base_OnEraseControlPoints(*args, **kwargs): return _ogl.PyControlPoint_base_OnEraseControlPoints(*args, **kwargs)
+    def base_OnMoveLink(*args, **kwargs): return _ogl.PyControlPoint_base_OnMoveLink(*args, **kwargs)
+    def base_OnSizingDragLeft(*args, **kwargs): return _ogl.PyControlPoint_base_OnSizingDragLeft(*args, **kwargs)
+    def base_OnSizingBeginDragLeft(*args, **kwargs): return _ogl.PyControlPoint_base_OnSizingBeginDragLeft(*args, **kwargs)
+    def base_OnSizingEndDragLeft(*args, **kwargs): return _ogl.PyControlPoint_base_OnSizingEndDragLeft(*args, **kwargs)
+    def base_OnBeginSize(*args, **kwargs): return _ogl.PyControlPoint_base_OnBeginSize(*args, **kwargs)
+    def base_OnEndSize(*args, **kwargs): return _ogl.PyControlPoint_base_OnEndSize(*args, **kwargs)
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyControlPoint instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
-from cmndlgs import *
+class PyControlPointPtr(PyControlPoint):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = PyControlPoint
+_ogl.PyControlPoint_swigregister(PyControlPointPtr)
 
-from windows3 import *
+class PyBitmapShape(PyRectangleShape):
+    def __init__(self, *args, **kwargs):
+        newobj = _ogl.new_PyBitmapShape(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+        self._setOORandCallbackInfo(PyBitmapShape)
+    def _setCallbackInfo(*args, **kwargs): return _ogl.PyBitmapShape__setCallbackInfo(*args, **kwargs)
+    def GetBitmap(*args, **kwargs): return _ogl.PyBitmapShape_GetBitmap(*args, **kwargs)
+    def GetFilename(*args, **kwargs): return _ogl.PyBitmapShape_GetFilename(*args, **kwargs)
+    def SetBitmap(*args, **kwargs): return _ogl.PyBitmapShape_SetBitmap(*args, **kwargs)
+    def SetFilename(*args, **kwargs): return _ogl.PyBitmapShape_SetFilename(*args, **kwargs)
+    def base_OnDelete(*args, **kwargs): return _ogl.PyBitmapShape_base_OnDelete(*args, **kwargs)
+    def base_OnDraw(*args, **kwargs): return _ogl.PyBitmapShape_base_OnDraw(*args, **kwargs)
+    def base_OnDrawContents(*args, **kwargs): return _ogl.PyBitmapShape_base_OnDrawContents(*args, **kwargs)
+    def base_OnDrawBranches(*args, **kwargs): return _ogl.PyBitmapShape_base_OnDrawBranches(*args, **kwargs)
+    def base_OnMoveLinks(*args, **kwargs): return _ogl.PyBitmapShape_base_OnMoveLinks(*args, **kwargs)
+    def base_OnErase(*args, **kwargs): return _ogl.PyBitmapShape_base_OnErase(*args, **kwargs)
+    def base_OnEraseContents(*args, **kwargs): return _ogl.PyBitmapShape_base_OnEraseContents(*args, **kwargs)
+    def base_OnHighlight(*args, **kwargs): return _ogl.PyBitmapShape_base_OnHighlight(*args, **kwargs)
+    def base_OnLeftClick(*args, **kwargs): return _ogl.PyBitmapShape_base_OnLeftClick(*args, **kwargs)
+    def base_OnLeftDoubleClick(*args, **kwargs): return _ogl.PyBitmapShape_base_OnLeftDoubleClick(*args, **kwargs)
+    def base_OnRightClick(*args, **kwargs): return _ogl.PyBitmapShape_base_OnRightClick(*args, **kwargs)
+    def base_OnSize(*args, **kwargs): return _ogl.PyBitmapShape_base_OnSize(*args, **kwargs)
+    def base_OnMovePre(*args, **kwargs): return _ogl.PyBitmapShape_base_OnMovePre(*args, **kwargs)
+    def base_OnMovePost(*args, **kwargs): return _ogl.PyBitmapShape_base_OnMovePost(*args, **kwargs)
+    def base_OnDragLeft(*args, **kwargs): return _ogl.PyBitmapShape_base_OnDragLeft(*args, **kwargs)
+    def base_OnBeginDragLeft(*args, **kwargs): return _ogl.PyBitmapShape_base_OnBeginDragLeft(*args, **kwargs)
+    def base_OnEndDragLeft(*args, **kwargs): return _ogl.PyBitmapShape_base_OnEndDragLeft(*args, **kwargs)
+    def base_OnDragRight(*args, **kwargs): return _ogl.PyBitmapShape_base_OnDragRight(*args, **kwargs)
+    def base_OnBeginDragRight(*args, **kwargs): return _ogl.PyBitmapShape_base_OnBeginDragRight(*args, **kwargs)
+    def base_OnEndDragRight(*args, **kwargs): return _ogl.PyBitmapShape_base_OnEndDragRight(*args, **kwargs)
+    def base_OnDrawOutline(*args, **kwargs): return _ogl.PyBitmapShape_base_OnDrawOutline(*args, **kwargs)
+    def base_OnDrawControlPoints(*args, **kwargs): return _ogl.PyBitmapShape_base_OnDrawControlPoints(*args, **kwargs)
+    def base_OnEraseControlPoints(*args, **kwargs): return _ogl.PyBitmapShape_base_OnEraseControlPoints(*args, **kwargs)
+    def base_OnMoveLink(*args, **kwargs): return _ogl.PyBitmapShape_base_OnMoveLink(*args, **kwargs)
+    def base_OnSizingDragLeft(*args, **kwargs): return _ogl.PyBitmapShape_base_OnSizingDragLeft(*args, **kwargs)
+    def base_OnSizingBeginDragLeft(*args, **kwargs): return _ogl.PyBitmapShape_base_OnSizingBeginDragLeft(*args, **kwargs)
+    def base_OnSizingEndDragLeft(*args, **kwargs): return _ogl.PyBitmapShape_base_OnSizingEndDragLeft(*args, **kwargs)
+    def base_OnBeginSize(*args, **kwargs): return _ogl.PyBitmapShape_base_OnBeginSize(*args, **kwargs)
+    def base_OnEndSize(*args, **kwargs): return _ogl.PyBitmapShape_base_OnEndSize(*args, **kwargs)
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyBitmapShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
-from image import *
+class PyBitmapShapePtr(PyBitmapShape):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = PyBitmapShape
+_ogl.PyBitmapShape_swigregister(PyBitmapShapePtr)
 
-from printfw import *
+class PyDrawnShape(PyRectangleShape):
+    def __init__(self, *args, **kwargs):
+        newobj = _ogl.new_PyDrawnShape(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+        self._setOORandCallbackInfo(PyDrawnShape)
+    def _setCallbackInfo(*args, **kwargs): return _ogl.PyDrawnShape__setCallbackInfo(*args, **kwargs)
+    def CalculateSize(*args, **kwargs): return _ogl.PyDrawnShape_CalculateSize(*args, **kwargs)
+    def DestroyClippingRect(*args, **kwargs): return _ogl.PyDrawnShape_DestroyClippingRect(*args, **kwargs)
+    def DrawArc(*args, **kwargs): return _ogl.PyDrawnShape_DrawArc(*args, **kwargs)
+    def DrawAtAngle(*args, **kwargs): return _ogl.PyDrawnShape_DrawAtAngle(*args, **kwargs)
+    def DrawEllipticArc(*args, **kwargs): return _ogl.PyDrawnShape_DrawEllipticArc(*args, **kwargs)
+    def DrawLine(*args, **kwargs): return _ogl.PyDrawnShape_DrawLine(*args, **kwargs)
+    def DrawLines(*args, **kwargs): return _ogl.PyDrawnShape_DrawLines(*args, **kwargs)
+    def DrawPoint(*args, **kwargs): return _ogl.PyDrawnShape_DrawPoint(*args, **kwargs)
+    def DrawPolygon(*args, **kwargs): return _ogl.PyDrawnShape_DrawPolygon(*args, **kwargs)
+    def DrawRectangle(*args, **kwargs): return _ogl.PyDrawnShape_DrawRectangle(*args, **kwargs)
+    def DrawRoundedRectangle(*args, **kwargs): return _ogl.PyDrawnShape_DrawRoundedRectangle(*args, **kwargs)
+    def DrawSpline(*args, **kwargs): return _ogl.PyDrawnShape_DrawSpline(*args, **kwargs)
+    def DrawText(*args, **kwargs): return _ogl.PyDrawnShape_DrawText(*args, **kwargs)
+    def GetAngle(*args, **kwargs): return _ogl.PyDrawnShape_GetAngle(*args, **kwargs)
+    def GetMetaFile(*args, **kwargs): return _ogl.PyDrawnShape_GetMetaFile(*args, **kwargs)
+    def GetRotation(*args, **kwargs): return _ogl.PyDrawnShape_GetRotation(*args, **kwargs)
+    def LoadFromMetaFile(*args, **kwargs): return _ogl.PyDrawnShape_LoadFromMetaFile(*args, **kwargs)
+    def Rotate(*args, **kwargs): return _ogl.PyDrawnShape_Rotate(*args, **kwargs)
+    def SetClippingRect(*args, **kwargs): return _ogl.PyDrawnShape_SetClippingRect(*args, **kwargs)
+    def SetDrawnBackgroundColour(*args, **kwargs): return _ogl.PyDrawnShape_SetDrawnBackgroundColour(*args, **kwargs)
+    def SetDrawnBackgroundMode(*args, **kwargs): return _ogl.PyDrawnShape_SetDrawnBackgroundMode(*args, **kwargs)
+    def SetDrawnBrush(*args, **kwargs): return _ogl.PyDrawnShape_SetDrawnBrush(*args, **kwargs)
+    def SetDrawnFont(*args, **kwargs): return _ogl.PyDrawnShape_SetDrawnFont(*args, **kwargs)
+    def SetDrawnPen(*args, **kwargs): return _ogl.PyDrawnShape_SetDrawnPen(*args, **kwargs)
+    def SetDrawnTextColour(*args, **kwargs): return _ogl.PyDrawnShape_SetDrawnTextColour(*args, **kwargs)
+    def Scale(*args, **kwargs): return _ogl.PyDrawnShape_Scale(*args, **kwargs)
+    def SetSaveToFile(*args, **kwargs): return _ogl.PyDrawnShape_SetSaveToFile(*args, **kwargs)
+    def Translate(*args, **kwargs): return _ogl.PyDrawnShape_Translate(*args, **kwargs)
+    def base_OnDelete(*args, **kwargs): return _ogl.PyDrawnShape_base_OnDelete(*args, **kwargs)
+    def base_OnDraw(*args, **kwargs): return _ogl.PyDrawnShape_base_OnDraw(*args, **kwargs)
+    def base_OnDrawContents(*args, **kwargs): return _ogl.PyDrawnShape_base_OnDrawContents(*args, **kwargs)
+    def base_OnDrawBranches(*args, **kwargs): return _ogl.PyDrawnShape_base_OnDrawBranches(*args, **kwargs)
+    def base_OnMoveLinks(*args, **kwargs): return _ogl.PyDrawnShape_base_OnMoveLinks(*args, **kwargs)
+    def base_OnErase(*args, **kwargs): return _ogl.PyDrawnShape_base_OnErase(*args, **kwargs)
+    def base_OnEraseContents(*args, **kwargs): return _ogl.PyDrawnShape_base_OnEraseContents(*args, **kwargs)
+    def base_OnHighlight(*args, **kwargs): return _ogl.PyDrawnShape_base_OnHighlight(*args, **kwargs)
+    def base_OnLeftClick(*args, **kwargs): return _ogl.PyDrawnShape_base_OnLeftClick(*args, **kwargs)
+    def base_OnLeftDoubleClick(*args, **kwargs): return _ogl.PyDrawnShape_base_OnLeftDoubleClick(*args, **kwargs)
+    def base_OnRightClick(*args, **kwargs): return _ogl.PyDrawnShape_base_OnRightClick(*args, **kwargs)
+    def base_OnSize(*args, **kwargs): return _ogl.PyDrawnShape_base_OnSize(*args, **kwargs)
+    def base_OnMovePre(*args, **kwargs): return _ogl.PyDrawnShape_base_OnMovePre(*args, **kwargs)
+    def base_OnMovePost(*args, **kwargs): return _ogl.PyDrawnShape_base_OnMovePost(*args, **kwargs)
+    def base_OnDragLeft(*args, **kwargs): return _ogl.PyDrawnShape_base_OnDragLeft(*args, **kwargs)
+    def base_OnBeginDragLeft(*args, **kwargs): return _ogl.PyDrawnShape_base_OnBeginDragLeft(*args, **kwargs)
+    def base_OnEndDragLeft(*args, **kwargs): return _ogl.PyDrawnShape_base_OnEndDragLeft(*args, **kwargs)
+    def base_OnDragRight(*args, **kwargs): return _ogl.PyDrawnShape_base_OnDragRight(*args, **kwargs)
+    def base_OnBeginDragRight(*args, **kwargs): return _ogl.PyDrawnShape_base_OnBeginDragRight(*args, **kwargs)
+    def base_OnEndDragRight(*args, **kwargs): return _ogl.PyDrawnShape_base_OnEndDragRight(*args, **kwargs)
+    def base_OnDrawOutline(*args, **kwargs): return _ogl.PyDrawnShape_base_OnDrawOutline(*args, **kwargs)
+    def base_OnDrawControlPoints(*args, **kwargs): return _ogl.PyDrawnShape_base_OnDrawControlPoints(*args, **kwargs)
+    def base_OnEraseControlPoints(*args, **kwargs): return _ogl.PyDrawnShape_base_OnEraseControlPoints(*args, **kwargs)
+    def base_OnMoveLink(*args, **kwargs): return _ogl.PyDrawnShape_base_OnMoveLink(*args, **kwargs)
+    def base_OnSizingDragLeft(*args, **kwargs): return _ogl.PyDrawnShape_base_OnSizingDragLeft(*args, **kwargs)
+    def base_OnSizingBeginDragLeft(*args, **kwargs): return _ogl.PyDrawnShape_base_OnSizingBeginDragLeft(*args, **kwargs)
+    def base_OnSizingEndDragLeft(*args, **kwargs): return _ogl.PyDrawnShape_base_OnSizingEndDragLeft(*args, **kwargs)
+    def base_OnBeginSize(*args, **kwargs): return _ogl.PyDrawnShape_base_OnBeginSize(*args, **kwargs)
+    def base_OnEndSize(*args, **kwargs): return _ogl.PyDrawnShape_base_OnEndSize(*args, **kwargs)
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyDrawnShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
-from sizers import *
+class PyDrawnShapePtr(PyDrawnShape):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = PyDrawnShape
+_ogl.PyDrawnShape_swigregister(PyDrawnShapePtr)
 
-from filesys import *
+class OGLConstraint(core.Object):
+    def __init__(self, *args, **kwargs):
+        newobj = _ogl.new_OGLConstraint(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+    def Evaluate(*args, **kwargs): return _ogl.OGLConstraint_Evaluate(*args, **kwargs)
+    def SetSpacing(*args, **kwargs): return _ogl.OGLConstraint_SetSpacing(*args, **kwargs)
+    def Equals(*args, **kwargs): return _ogl.OGLConstraint_Equals(*args, **kwargs)
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxOGLConstraint instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
-from oglbasic import *
+class OGLConstraintPtr(OGLConstraint):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = OGLConstraint
+_ogl.OGLConstraint_swigregister(OGLConstraintPtr)
 
-from oglshapes import *
+class PyCompositeShape(PyRectangleShape):
+    def __init__(self, *args, **kwargs):
+        newobj = _ogl.new_PyCompositeShape(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+        self._setOORandCallbackInfo(PyCompositeShape)
+    def _setCallbackInfo(*args, **kwargs): return _ogl.PyCompositeShape__setCallbackInfo(*args, **kwargs)
+    def AddChild(*args, **kwargs): return _ogl.PyCompositeShape_AddChild(*args, **kwargs)
+    def AddConstraint(*args, **kwargs): return _ogl.PyCompositeShape_AddConstraint(*args, **kwargs)
+    def AddConstrainedShapes(*args, **kwargs): return _ogl.PyCompositeShape_AddConstrainedShapes(*args, **kwargs)
+    def AddSimpleConstraint(*args, **kwargs): return _ogl.PyCompositeShape_AddSimpleConstraint(*args, **kwargs)
+    def CalculateSize(*args, **kwargs): return _ogl.PyCompositeShape_CalculateSize(*args, **kwargs)
+    def ContainsDivision(*args, **kwargs): return _ogl.PyCompositeShape_ContainsDivision(*args, **kwargs)
+    def DeleteConstraint(*args, **kwargs): return _ogl.PyCompositeShape_DeleteConstraint(*args, **kwargs)
+    def DeleteConstraintsInvolvingChild(*args, **kwargs): return _ogl.PyCompositeShape_DeleteConstraintsInvolvingChild(*args, **kwargs)
+    def FindContainerImage(*args, **kwargs): return _ogl.PyCompositeShape_FindContainerImage(*args, **kwargs)
+    def GetConstraints(*args, **kwargs): return _ogl.PyCompositeShape_GetConstraints(*args, **kwargs)
+    def GetDivisions(*args, **kwargs): return _ogl.PyCompositeShape_GetDivisions(*args, **kwargs)
+    def MakeContainer(*args, **kwargs): return _ogl.PyCompositeShape_MakeContainer(*args, **kwargs)
+    def Recompute(*args, **kwargs): return _ogl.PyCompositeShape_Recompute(*args, **kwargs)
+    def RemoveChild(*args, **kwargs): return _ogl.PyCompositeShape_RemoveChild(*args, **kwargs)
+    def base_OnDelete(*args, **kwargs): return _ogl.PyCompositeShape_base_OnDelete(*args, **kwargs)
+    def base_OnDraw(*args, **kwargs): return _ogl.PyCompositeShape_base_OnDraw(*args, **kwargs)
+    def base_OnDrawContents(*args, **kwargs): return _ogl.PyCompositeShape_base_OnDrawContents(*args, **kwargs)
+    def base_OnDrawBranches(*args, **kwargs): return _ogl.PyCompositeShape_base_OnDrawBranches(*args, **kwargs)
+    def base_OnMoveLinks(*args, **kwargs): return _ogl.PyCompositeShape_base_OnMoveLinks(*args, **kwargs)
+    def base_OnErase(*args, **kwargs): return _ogl.PyCompositeShape_base_OnErase(*args, **kwargs)
+    def base_OnEraseContents(*args, **kwargs): return _ogl.PyCompositeShape_base_OnEraseContents(*args, **kwargs)
+    def base_OnHighlight(*args, **kwargs): return _ogl.PyCompositeShape_base_OnHighlight(*args, **kwargs)
+    def base_OnLeftClick(*args, **kwargs): return _ogl.PyCompositeShape_base_OnLeftClick(*args, **kwargs)
+    def base_OnLeftDoubleClick(*args, **kwargs): return _ogl.PyCompositeShape_base_OnLeftDoubleClick(*args, **kwargs)
+    def base_OnRightClick(*args, **kwargs): return _ogl.PyCompositeShape_base_OnRightClick(*args, **kwargs)
+    def base_OnSize(*args, **kwargs): return _ogl.PyCompositeShape_base_OnSize(*args, **kwargs)
+    def base_OnMovePre(*args, **kwargs): return _ogl.PyCompositeShape_base_OnMovePre(*args, **kwargs)
+    def base_OnMovePost(*args, **kwargs): return _ogl.PyCompositeShape_base_OnMovePost(*args, **kwargs)
+    def base_OnDragLeft(*args, **kwargs): return _ogl.PyCompositeShape_base_OnDragLeft(*args, **kwargs)
+    def base_OnBeginDragLeft(*args, **kwargs): return _ogl.PyCompositeShape_base_OnBeginDragLeft(*args, **kwargs)
+    def base_OnEndDragLeft(*args, **kwargs): return _ogl.PyCompositeShape_base_OnEndDragLeft(*args, **kwargs)
+    def base_OnDragRight(*args, **kwargs): return _ogl.PyCompositeShape_base_OnDragRight(*args, **kwargs)
+    def base_OnBeginDragRight(*args, **kwargs): return _ogl.PyCompositeShape_base_OnBeginDragRight(*args, **kwargs)
+    def base_OnEndDragRight(*args, **kwargs): return _ogl.PyCompositeShape_base_OnEndDragRight(*args, **kwargs)
+    def base_OnDrawOutline(*args, **kwargs): return _ogl.PyCompositeShape_base_OnDrawOutline(*args, **kwargs)
+    def base_OnDrawControlPoints(*args, **kwargs): return _ogl.PyCompositeShape_base_OnDrawControlPoints(*args, **kwargs)
+    def base_OnEraseControlPoints(*args, **kwargs): return _ogl.PyCompositeShape_base_OnEraseControlPoints(*args, **kwargs)
+    def base_OnMoveLink(*args, **kwargs): return _ogl.PyCompositeShape_base_OnMoveLink(*args, **kwargs)
+    def base_OnSizingDragLeft(*args, **kwargs): return _ogl.PyCompositeShape_base_OnSizingDragLeft(*args, **kwargs)
+    def base_OnSizingBeginDragLeft(*args, **kwargs): return _ogl.PyCompositeShape_base_OnSizingBeginDragLeft(*args, **kwargs)
+    def base_OnSizingEndDragLeft(*args, **kwargs): return _ogl.PyCompositeShape_base_OnSizingEndDragLeft(*args, **kwargs)
+    def base_OnBeginSize(*args, **kwargs): return _ogl.PyCompositeShape_base_OnBeginSize(*args, **kwargs)
+    def base_OnEndSize(*args, **kwargs): return _ogl.PyCompositeShape_base_OnEndSize(*args, **kwargs)
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyCompositeShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
-from oglshapes2 import *
+class PyCompositeShapePtr(PyCompositeShape):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = PyCompositeShape
+_ogl.PyCompositeShape_swigregister(PyCompositeShapePtr)
 
-from oglcanvas import *
-import wx
+class PyDividedShape(PyRectangleShape):
+    def __init__(self, *args, **kwargs):
+        newobj = _ogl.new_PyDividedShape(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+        self._setOORandCallbackInfo(PyDividedShape)
+    def _setCallbackInfo(*args, **kwargs): return _ogl.PyDividedShape__setCallbackInfo(*args, **kwargs)
+    def EditRegions(*args, **kwargs): return _ogl.PyDividedShape_EditRegions(*args, **kwargs)
+    def SetRegionSizes(*args, **kwargs): return _ogl.PyDividedShape_SetRegionSizes(*args, **kwargs)
+    def base_OnDelete(*args, **kwargs): return _ogl.PyDividedShape_base_OnDelete(*args, **kwargs)
+    def base_OnDraw(*args, **kwargs): return _ogl.PyDividedShape_base_OnDraw(*args, **kwargs)
+    def base_OnDrawContents(*args, **kwargs): return _ogl.PyDividedShape_base_OnDrawContents(*args, **kwargs)
+    def base_OnDrawBranches(*args, **kwargs): return _ogl.PyDividedShape_base_OnDrawBranches(*args, **kwargs)
+    def base_OnMoveLinks(*args, **kwargs): return _ogl.PyDividedShape_base_OnMoveLinks(*args, **kwargs)
+    def base_OnErase(*args, **kwargs): return _ogl.PyDividedShape_base_OnErase(*args, **kwargs)
+    def base_OnEraseContents(*args, **kwargs): return _ogl.PyDividedShape_base_OnEraseContents(*args, **kwargs)
+    def base_OnHighlight(*args, **kwargs): return _ogl.PyDividedShape_base_OnHighlight(*args, **kwargs)
+    def base_OnLeftClick(*args, **kwargs): return _ogl.PyDividedShape_base_OnLeftClick(*args, **kwargs)
+    def base_OnLeftDoubleClick(*args, **kwargs): return _ogl.PyDividedShape_base_OnLeftDoubleClick(*args, **kwargs)
+    def base_OnRightClick(*args, **kwargs): return _ogl.PyDividedShape_base_OnRightClick(*args, **kwargs)
+    def base_OnSize(*args, **kwargs): return _ogl.PyDividedShape_base_OnSize(*args, **kwargs)
+    def base_OnMovePre(*args, **kwargs): return _ogl.PyDividedShape_base_OnMovePre(*args, **kwargs)
+    def base_OnMovePost(*args, **kwargs): return _ogl.PyDividedShape_base_OnMovePost(*args, **kwargs)
+    def base_OnDragLeft(*args, **kwargs): return _ogl.PyDividedShape_base_OnDragLeft(*args, **kwargs)
+    def base_OnBeginDragLeft(*args, **kwargs): return _ogl.PyDividedShape_base_OnBeginDragLeft(*args, **kwargs)
+    def base_OnEndDragLeft(*args, **kwargs): return _ogl.PyDividedShape_base_OnEndDragLeft(*args, **kwargs)
+    def base_OnDragRight(*args, **kwargs): return _ogl.PyDividedShape_base_OnDragRight(*args, **kwargs)
+    def base_OnBeginDragRight(*args, **kwargs): return _ogl.PyDividedShape_base_OnBeginDragRight(*args, **kwargs)
+    def base_OnEndDragRight(*args, **kwargs): return _ogl.PyDividedShape_base_OnEndDragRight(*args, **kwargs)
+    def base_OnDrawOutline(*args, **kwargs): return _ogl.PyDividedShape_base_OnDrawOutline(*args, **kwargs)
+    def base_OnDrawControlPoints(*args, **kwargs): return _ogl.PyDividedShape_base_OnDrawControlPoints(*args, **kwargs)
+    def base_OnEraseControlPoints(*args, **kwargs): return _ogl.PyDividedShape_base_OnEraseControlPoints(*args, **kwargs)
+    def base_OnMoveLink(*args, **kwargs): return _ogl.PyDividedShape_base_OnMoveLink(*args, **kwargs)
+    def base_OnSizingDragLeft(*args, **kwargs): return _ogl.PyDividedShape_base_OnSizingDragLeft(*args, **kwargs)
+    def base_OnSizingBeginDragLeft(*args, **kwargs): return _ogl.PyDividedShape_base_OnSizingBeginDragLeft(*args, **kwargs)
+    def base_OnSizingEndDragLeft(*args, **kwargs): return _ogl.PyDividedShape_base_OnSizingEndDragLeft(*args, **kwargs)
+    def base_OnBeginSize(*args, **kwargs): return _ogl.PyDividedShape_base_OnBeginSize(*args, **kwargs)
+    def base_OnEndSize(*args, **kwargs): return _ogl.PyDividedShape_base_OnEndSize(*args, **kwargs)
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyDividedShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 
+class PyDividedShapePtr(PyDividedShape):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = PyDividedShape
+_ogl.PyDividedShape_swigregister(PyDividedShapePtr)
+
+class PyDivisionShape(PyCompositeShape):
+    def __init__(self, *args, **kwargs):
+        newobj = _ogl.new_PyDivisionShape(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+        self._setOORandCallbackInfo(PyDivisionShape)
+    def _setCallbackInfo(*args, **kwargs): return _ogl.PyDivisionShape__setCallbackInfo(*args, **kwargs)
+    def AdjustBottom(*args, **kwargs): return _ogl.PyDivisionShape_AdjustBottom(*args, **kwargs)
+    def AdjustLeft(*args, **kwargs): return _ogl.PyDivisionShape_AdjustLeft(*args, **kwargs)
+    def AdjustRight(*args, **kwargs): return _ogl.PyDivisionShape_AdjustRight(*args, **kwargs)
+    def AdjustTop(*args, **kwargs): return _ogl.PyDivisionShape_AdjustTop(*args, **kwargs)
+    def Divide(*args, **kwargs): return _ogl.PyDivisionShape_Divide(*args, **kwargs)
+    def EditEdge(*args, **kwargs): return _ogl.PyDivisionShape_EditEdge(*args, **kwargs)
+    def GetBottomSide(*args, **kwargs): return _ogl.PyDivisionShape_GetBottomSide(*args, **kwargs)
+    def GetHandleSide(*args, **kwargs): return _ogl.PyDivisionShape_GetHandleSide(*args, **kwargs)
+    def GetLeftSide(*args, **kwargs): return _ogl.PyDivisionShape_GetLeftSide(*args, **kwargs)
+    def GetLeftSideColour(*args, **kwargs): return _ogl.PyDivisionShape_GetLeftSideColour(*args, **kwargs)
+    def GetLeftSidePen(*args, **kwargs): return _ogl.PyDivisionShape_GetLeftSidePen(*args, **kwargs)
+    def GetRightSide(*args, **kwargs): return _ogl.PyDivisionShape_GetRightSide(*args, **kwargs)
+    def GetTopSide(*args, **kwargs): return _ogl.PyDivisionShape_GetTopSide(*args, **kwargs)
+    def GetTopSidePen(*args, **kwargs): return _ogl.PyDivisionShape_GetTopSidePen(*args, **kwargs)
+    def ResizeAdjoining(*args, **kwargs): return _ogl.PyDivisionShape_ResizeAdjoining(*args, **kwargs)
+    def PopupMenu(*args, **kwargs): return _ogl.PyDivisionShape_PopupMenu(*args, **kwargs)
+    def SetBottomSide(*args, **kwargs): return _ogl.PyDivisionShape_SetBottomSide(*args, **kwargs)
+    def SetHandleSide(*args, **kwargs): return _ogl.PyDivisionShape_SetHandleSide(*args, **kwargs)
+    def SetLeftSide(*args, **kwargs): return _ogl.PyDivisionShape_SetLeftSide(*args, **kwargs)
+    def SetLeftSideColour(*args, **kwargs): return _ogl.PyDivisionShape_SetLeftSideColour(*args, **kwargs)
+    def SetLeftSidePen(*args, **kwargs): return _ogl.PyDivisionShape_SetLeftSidePen(*args, **kwargs)
+    def SetRightSide(*args, **kwargs): return _ogl.PyDivisionShape_SetRightSide(*args, **kwargs)
+    def SetTopSide(*args, **kwargs): return _ogl.PyDivisionShape_SetTopSide(*args, **kwargs)
+    def SetTopSideColour(*args, **kwargs): return _ogl.PyDivisionShape_SetTopSideColour(*args, **kwargs)
+    def SetTopSidePen(*args, **kwargs): return _ogl.PyDivisionShape_SetTopSidePen(*args, **kwargs)
+    def base_OnDelete(*args, **kwargs): return _ogl.PyDivisionShape_base_OnDelete(*args, **kwargs)
+    def base_OnDraw(*args, **kwargs): return _ogl.PyDivisionShape_base_OnDraw(*args, **kwargs)
+    def base_OnDrawContents(*args, **kwargs): return _ogl.PyDivisionShape_base_OnDrawContents(*args, **kwargs)
+    def base_OnDrawBranches(*args, **kwargs): return _ogl.PyDivisionShape_base_OnDrawBranches(*args, **kwargs)
+    def base_OnMoveLinks(*args, **kwargs): return _ogl.PyDivisionShape_base_OnMoveLinks(*args, **kwargs)
+    def base_OnErase(*args, **kwargs): return _ogl.PyDivisionShape_base_OnErase(*args, **kwargs)
+    def base_OnEraseContents(*args, **kwargs): return _ogl.PyDivisionShape_base_OnEraseContents(*args, **kwargs)
+    def base_OnHighlight(*args, **kwargs): return _ogl.PyDivisionShape_base_OnHighlight(*args, **kwargs)
+    def base_OnLeftClick(*args, **kwargs): return _ogl.PyDivisionShape_base_OnLeftClick(*args, **kwargs)
+    def base_OnLeftDoubleClick(*args, **kwargs): return _ogl.PyDivisionShape_base_OnLeftDoubleClick(*args, **kwargs)
+    def base_OnRightClick(*args, **kwargs): return _ogl.PyDivisionShape_base_OnRightClick(*args, **kwargs)
+    def base_OnSize(*args, **kwargs): return _ogl.PyDivisionShape_base_OnSize(*args, **kwargs)
+    def base_OnMovePre(*args, **kwargs): return _ogl.PyDivisionShape_base_OnMovePre(*args, **kwargs)
+    def base_OnMovePost(*args, **kwargs): return _ogl.PyDivisionShape_base_OnMovePost(*args, **kwargs)
+    def base_OnDragLeft(*args, **kwargs): return _ogl.PyDivisionShape_base_OnDragLeft(*args, **kwargs)
+    def base_OnBeginDragLeft(*args, **kwargs): return _ogl.PyDivisionShape_base_OnBeginDragLeft(*args, **kwargs)
+    def base_OnEndDragLeft(*args, **kwargs): return _ogl.PyDivisionShape_base_OnEndDragLeft(*args, **kwargs)
+    def base_OnDragRight(*args, **kwargs): return _ogl.PyDivisionShape_base_OnDragRight(*args, **kwargs)
+    def base_OnBeginDragRight(*args, **kwargs): return _ogl.PyDivisionShape_base_OnBeginDragRight(*args, **kwargs)
+    def base_OnEndDragRight(*args, **kwargs): return _ogl.PyDivisionShape_base_OnEndDragRight(*args, **kwargs)
+    def base_OnDrawOutline(*args, **kwargs): return _ogl.PyDivisionShape_base_OnDrawOutline(*args, **kwargs)
+    def base_OnDrawControlPoints(*args, **kwargs): return _ogl.PyDivisionShape_base_OnDrawControlPoints(*args, **kwargs)
+    def base_OnEraseControlPoints(*args, **kwargs): return _ogl.PyDivisionShape_base_OnEraseControlPoints(*args, **kwargs)
+    def base_OnMoveLink(*args, **kwargs): return _ogl.PyDivisionShape_base_OnMoveLink(*args, **kwargs)
+    def base_OnSizingDragLeft(*args, **kwargs): return _ogl.PyDivisionShape_base_OnSizingDragLeft(*args, **kwargs)
+    def base_OnSizingBeginDragLeft(*args, **kwargs): return _ogl.PyDivisionShape_base_OnSizingBeginDragLeft(*args, **kwargs)
+    def base_OnSizingEndDragLeft(*args, **kwargs): return _ogl.PyDivisionShape_base_OnSizingEndDragLeft(*args, **kwargs)
+    def base_OnBeginSize(*args, **kwargs): return _ogl.PyDivisionShape_base_OnBeginSize(*args, **kwargs)
+    def base_OnEndSize(*args, **kwargs): return _ogl.PyDivisionShape_base_OnEndSize(*args, **kwargs)
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyDivisionShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+class PyDivisionShapePtr(PyDivisionShape):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = PyDivisionShape
+_ogl.PyDivisionShape_swigregister(PyDivisionShapePtr)
+
+class PyEllipseShape(PyShape):
+    def __init__(self, *args, **kwargs):
+        newobj = _ogl.new_PyEllipseShape(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+        self._setOORandCallbackInfo(PyEllipseShape)
+    def _setCallbackInfo(*args, **kwargs): return _ogl.PyEllipseShape__setCallbackInfo(*args, **kwargs)
+    def base_OnDraw(*args, **kwargs): return _ogl.PyEllipseShape_base_OnDraw(*args, **kwargs)
+    def base_OnDrawContents(*args, **kwargs): return _ogl.PyEllipseShape_base_OnDrawContents(*args, **kwargs)
+    def base_OnDrawBranches(*args, **kwargs): return _ogl.PyEllipseShape_base_OnDrawBranches(*args, **kwargs)
+    def base_OnMoveLinks(*args, **kwargs): return _ogl.PyEllipseShape_base_OnMoveLinks(*args, **kwargs)
+    def base_OnErase(*args, **kwargs): return _ogl.PyEllipseShape_base_OnErase(*args, **kwargs)
+    def base_OnEraseContents(*args, **kwargs): return _ogl.PyEllipseShape_base_OnEraseContents(*args, **kwargs)
+    def base_OnHighlight(*args, **kwargs): return _ogl.PyEllipseShape_base_OnHighlight(*args, **kwargs)
+    def base_OnLeftClick(*args, **kwargs): return _ogl.PyEllipseShape_base_OnLeftClick(*args, **kwargs)
+    def base_OnLeftDoubleClick(*args, **kwargs): return _ogl.PyEllipseShape_base_OnLeftDoubleClick(*args, **kwargs)
+    def base_OnRightClick(*args, **kwargs): return _ogl.PyEllipseShape_base_OnRightClick(*args, **kwargs)
+    def base_OnSize(*args, **kwargs): return _ogl.PyEllipseShape_base_OnSize(*args, **kwargs)
+    def base_OnMovePre(*args, **kwargs): return _ogl.PyEllipseShape_base_OnMovePre(*args, **kwargs)
+    def base_OnMovePost(*args, **kwargs): return _ogl.PyEllipseShape_base_OnMovePost(*args, **kwargs)
+    def base_OnDragLeft(*args, **kwargs): return _ogl.PyEllipseShape_base_OnDragLeft(*args, **kwargs)
+    def base_OnBeginDragLeft(*args, **kwargs): return _ogl.PyEllipseShape_base_OnBeginDragLeft(*args, **kwargs)
+    def base_OnEndDragLeft(*args, **kwargs): return _ogl.PyEllipseShape_base_OnEndDragLeft(*args, **kwargs)
+    def base_OnDragRight(*args, **kwargs): return _ogl.PyEllipseShape_base_OnDragRight(*args, **kwargs)
+    def base_OnBeginDragRight(*args, **kwargs): return _ogl.PyEllipseShape_base_OnBeginDragRight(*args, **kwargs)
+    def base_OnEndDragRight(*args, **kwargs): return _ogl.PyEllipseShape_base_OnEndDragRight(*args, **kwargs)
+    def base_OnDrawOutline(*args, **kwargs): return _ogl.PyEllipseShape_base_OnDrawOutline(*args, **kwargs)
+    def base_OnDrawControlPoints(*args, **kwargs): return _ogl.PyEllipseShape_base_OnDrawControlPoints(*args, **kwargs)
+    def base_OnEraseControlPoints(*args, **kwargs): return _ogl.PyEllipseShape_base_OnEraseControlPoints(*args, **kwargs)
+    def base_OnMoveLink(*args, **kwargs): return _ogl.PyEllipseShape_base_OnMoveLink(*args, **kwargs)
+    def base_OnSizingDragLeft(*args, **kwargs): return _ogl.PyEllipseShape_base_OnSizingDragLeft(*args, **kwargs)
+    def base_OnSizingBeginDragLeft(*args, **kwargs): return _ogl.PyEllipseShape_base_OnSizingBeginDragLeft(*args, **kwargs)
+    def base_OnSizingEndDragLeft(*args, **kwargs): return _ogl.PyEllipseShape_base_OnSizingEndDragLeft(*args, **kwargs)
+    def base_OnBeginSize(*args, **kwargs): return _ogl.PyEllipseShape_base_OnBeginSize(*args, **kwargs)
+    def base_OnEndSize(*args, **kwargs): return _ogl.PyEllipseShape_base_OnEndSize(*args, **kwargs)
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyEllipseShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+class PyEllipseShapePtr(PyEllipseShape):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = PyEllipseShape
+_ogl.PyEllipseShape_swigregister(PyEllipseShapePtr)
+
+class PyCircleShape(PyEllipseShape):
+    def __init__(self, *args, **kwargs):
+        newobj = _ogl.new_PyCircleShape(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+        self._setOORandCallbackInfo(PyCircleShape)
+    def _setCallbackInfo(*args, **kwargs): return _ogl.PyCircleShape__setCallbackInfo(*args, **kwargs)
+    def base_OnDraw(*args, **kwargs): return _ogl.PyCircleShape_base_OnDraw(*args, **kwargs)
+    def base_OnDrawContents(*args, **kwargs): return _ogl.PyCircleShape_base_OnDrawContents(*args, **kwargs)
+    def base_OnDrawBranches(*args, **kwargs): return _ogl.PyCircleShape_base_OnDrawBranches(*args, **kwargs)
+    def base_OnMoveLinks(*args, **kwargs): return _ogl.PyCircleShape_base_OnMoveLinks(*args, **kwargs)
+    def base_OnErase(*args, **kwargs): return _ogl.PyCircleShape_base_OnErase(*args, **kwargs)
+    def base_OnEraseContents(*args, **kwargs): return _ogl.PyCircleShape_base_OnEraseContents(*args, **kwargs)
+    def base_OnHighlight(*args, **kwargs): return _ogl.PyCircleShape_base_OnHighlight(*args, **kwargs)
+    def base_OnLeftClick(*args, **kwargs): return _ogl.PyCircleShape_base_OnLeftClick(*args, **kwargs)
+    def base_OnLeftDoubleClick(*args, **kwargs): return _ogl.PyCircleShape_base_OnLeftDoubleClick(*args, **kwargs)
+    def base_OnRightClick(*args, **kwargs): return _ogl.PyCircleShape_base_OnRightClick(*args, **kwargs)
+    def base_OnSize(*args, **kwargs): return _ogl.PyCircleShape_base_OnSize(*args, **kwargs)
+    def base_OnMovePre(*args, **kwargs): return _ogl.PyCircleShape_base_OnMovePre(*args, **kwargs)
+    def base_OnMovePost(*args, **kwargs): return _ogl.PyCircleShape_base_OnMovePost(*args, **kwargs)
+    def base_OnDragLeft(*args, **kwargs): return _ogl.PyCircleShape_base_OnDragLeft(*args, **kwargs)
+    def base_OnBeginDragLeft(*args, **kwargs): return _ogl.PyCircleShape_base_OnBeginDragLeft(*args, **kwargs)
+    def base_OnEndDragLeft(*args, **kwargs): return _ogl.PyCircleShape_base_OnEndDragLeft(*args, **kwargs)
+    def base_OnDragRight(*args, **kwargs): return _ogl.PyCircleShape_base_OnDragRight(*args, **kwargs)
+    def base_OnBeginDragRight(*args, **kwargs): return _ogl.PyCircleShape_base_OnBeginDragRight(*args, **kwargs)
+    def base_OnEndDragRight(*args, **kwargs): return _ogl.PyCircleShape_base_OnEndDragRight(*args, **kwargs)
+    def base_OnDrawOutline(*args, **kwargs): return _ogl.PyCircleShape_base_OnDrawOutline(*args, **kwargs)
+    def base_OnDrawControlPoints(*args, **kwargs): return _ogl.PyCircleShape_base_OnDrawControlPoints(*args, **kwargs)
+    def base_OnEraseControlPoints(*args, **kwargs): return _ogl.PyCircleShape_base_OnEraseControlPoints(*args, **kwargs)
+    def base_OnMoveLink(*args, **kwargs): return _ogl.PyCircleShape_base_OnMoveLink(*args, **kwargs)
+    def base_OnSizingDragLeft(*args, **kwargs): return _ogl.PyCircleShape_base_OnSizingDragLeft(*args, **kwargs)
+    def base_OnSizingBeginDragLeft(*args, **kwargs): return _ogl.PyCircleShape_base_OnSizingBeginDragLeft(*args, **kwargs)
+    def base_OnSizingEndDragLeft(*args, **kwargs): return _ogl.PyCircleShape_base_OnSizingEndDragLeft(*args, **kwargs)
+    def base_OnBeginSize(*args, **kwargs): return _ogl.PyCircleShape_base_OnBeginSize(*args, **kwargs)
+    def base_OnEndSize(*args, **kwargs): return _ogl.PyCircleShape_base_OnEndSize(*args, **kwargs)
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyCircleShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+class PyCircleShapePtr(PyCircleShape):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = PyCircleShape
+_ogl.PyCircleShape_swigregister(PyCircleShapePtr)
+
+class ArrowHead(core.Object):
+    def __init__(self, *args, **kwargs):
+        newobj = _ogl.new_ArrowHead(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+    def __del__(self, destroy=_ogl.delete_ArrowHead):
+        try:
+            if self.thisown: destroy(self)
+        except: pass
+    def _GetType(*args, **kwargs): return _ogl.ArrowHead__GetType(*args, **kwargs)
+    def GetPosition(*args, **kwargs): return _ogl.ArrowHead_GetPosition(*args, **kwargs)
+    def SetPosition(*args, **kwargs): return _ogl.ArrowHead_SetPosition(*args, **kwargs)
+    def GetXOffset(*args, **kwargs): return _ogl.ArrowHead_GetXOffset(*args, **kwargs)
+    def GetYOffset(*args, **kwargs): return _ogl.ArrowHead_GetYOffset(*args, **kwargs)
+    def GetSpacing(*args, **kwargs): return _ogl.ArrowHead_GetSpacing(*args, **kwargs)
+    def GetSize(*args, **kwargs): return _ogl.ArrowHead_GetSize(*args, **kwargs)
+    def GetName(*args, **kwargs): return _ogl.ArrowHead_GetName(*args, **kwargs)
+    def SetXOffset(*args, **kwargs): return _ogl.ArrowHead_SetXOffset(*args, **kwargs)
+    def SetYOffset(*args, **kwargs): return _ogl.ArrowHead_SetYOffset(*args, **kwargs)
+    def GetMetaFile(*args, **kwargs): return _ogl.ArrowHead_GetMetaFile(*args, **kwargs)
+    def GetId(*args, **kwargs): return _ogl.ArrowHead_GetId(*args, **kwargs)
+    def GetArrowEnd(*args, **kwargs): return _ogl.ArrowHead_GetArrowEnd(*args, **kwargs)
+    def GetArrowSize(*args, **kwargs): return _ogl.ArrowHead_GetArrowSize(*args, **kwargs)
+    def SetSize(*args, **kwargs): return _ogl.ArrowHead_SetSize(*args, **kwargs)
+    def SetSpacing(*args, **kwargs): return _ogl.ArrowHead_SetSpacing(*args, **kwargs)
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxArrowHead instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+class ArrowHeadPtr(ArrowHead):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = ArrowHead
+_ogl.ArrowHead_swigregister(ArrowHeadPtr)
+
+class PyLineShape(PyShape):
+    def __init__(self, *args, **kwargs):
+        newobj = _ogl.new_PyLineShape(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+        self._setOORandCallbackInfo(PyLineShape)
+    def _setCallbackInfo(*args, **kwargs): return _ogl.PyLineShape__setCallbackInfo(*args, **kwargs)
+    def AddArrow(*args, **kwargs): return _ogl.PyLineShape_AddArrow(*args, **kwargs)
+    def AddArrowOrdered(*args, **kwargs): return _ogl.PyLineShape_AddArrowOrdered(*args, **kwargs)
+    def ClearArrow(*args, **kwargs): return _ogl.PyLineShape_ClearArrow(*args, **kwargs)
+    def ClearArrowsAtPosition(*args, **kwargs): return _ogl.PyLineShape_ClearArrowsAtPosition(*args, **kwargs)
+    def DrawArrow(*args, **kwargs): return _ogl.PyLineShape_DrawArrow(*args, **kwargs)
+    def DeleteArrowHeadId(*args, **kwargs): return _ogl.PyLineShape_DeleteArrowHeadId(*args, **kwargs)
+    def DeleteArrowHead(*args, **kwargs): return _ogl.PyLineShape_DeleteArrowHead(*args, **kwargs)
+    def DeleteLineControlPoint(*args, **kwargs): return _ogl.PyLineShape_DeleteLineControlPoint(*args, **kwargs)
+    def DrawArrows(*args, **kwargs): return _ogl.PyLineShape_DrawArrows(*args, **kwargs)
+    def DrawRegion(*args, **kwargs): return _ogl.PyLineShape_DrawRegion(*args, **kwargs)
+    def EraseRegion(*args, **kwargs): return _ogl.PyLineShape_EraseRegion(*args, **kwargs)
+    def FindArrowHeadId(*args, **kwargs): return _ogl.PyLineShape_FindArrowHeadId(*args, **kwargs)
+    def FindArrowHead(*args, **kwargs): return _ogl.PyLineShape_FindArrowHead(*args, **kwargs)
+    def FindLineEndPoints(*args, **kwargs): return _ogl.PyLineShape_FindLineEndPoints(*args, **kwargs)
+    def FindLinePosition(*args, **kwargs): return _ogl.PyLineShape_FindLinePosition(*args, **kwargs)
+    def FindMinimumWidth(*args, **kwargs): return _ogl.PyLineShape_FindMinimumWidth(*args, **kwargs)
+    def FindNth(*args, **kwargs): return _ogl.PyLineShape_FindNth(*args, **kwargs)
+    def GetAttachmentFrom(*args, **kwargs): return _ogl.PyLineShape_GetAttachmentFrom(*args, **kwargs)
+    def GetAttachmentTo(*args, **kwargs): return _ogl.PyLineShape_GetAttachmentTo(*args, **kwargs)
+    def GetEnds(*args, **kwargs): return _ogl.PyLineShape_GetEnds(*args, **kwargs)
+    def GetFrom(*args, **kwargs): return _ogl.PyLineShape_GetFrom(*args, **kwargs)
+    def GetLabelPosition(*args, **kwargs): return _ogl.PyLineShape_GetLabelPosition(*args, **kwargs)
+    def GetNextControlPoint(*args, **kwargs): return _ogl.PyLineShape_GetNextControlPoint(*args, **kwargs)
+    def GetTo(*args, **kwargs): return _ogl.PyLineShape_GetTo(*args, **kwargs)
+    def Initialise(*args, **kwargs): return _ogl.PyLineShape_Initialise(*args, **kwargs)
+    def InsertLineControlPoint(*args, **kwargs): return _ogl.PyLineShape_InsertLineControlPoint(*args, **kwargs)
+    def IsEnd(*args, **kwargs): return _ogl.PyLineShape_IsEnd(*args, **kwargs)
+    def IsSpline(*args, **kwargs): return _ogl.PyLineShape_IsSpline(*args, **kwargs)
+    def MakeLineControlPoints(*args, **kwargs): return _ogl.PyLineShape_MakeLineControlPoints(*args, **kwargs)
+    def GetLineControlPoints(*args, **kwargs): return _ogl.PyLineShape_GetLineControlPoints(*args, **kwargs)
+    def SetAttachmentFrom(*args, **kwargs): return _ogl.PyLineShape_SetAttachmentFrom(*args, **kwargs)
+    def SetAttachments(*args, **kwargs): return _ogl.PyLineShape_SetAttachments(*args, **kwargs)
+    def SetAttachmentTo(*args, **kwargs): return _ogl.PyLineShape_SetAttachmentTo(*args, **kwargs)
+    def SetEnds(*args, **kwargs): return _ogl.PyLineShape_SetEnds(*args, **kwargs)
+    def SetFrom(*args, **kwargs): return _ogl.PyLineShape_SetFrom(*args, **kwargs)
+    def SetIgnoreOffsets(*args, **kwargs): return _ogl.PyLineShape_SetIgnoreOffsets(*args, **kwargs)
+    def SetSpline(*args, **kwargs): return _ogl.PyLineShape_SetSpline(*args, **kwargs)
+    def SetTo(*args, **kwargs): return _ogl.PyLineShape_SetTo(*args, **kwargs)
+    def Straighten(*args, **kwargs): return _ogl.PyLineShape_Straighten(*args, **kwargs)
+    def Unlink(*args, **kwargs): return _ogl.PyLineShape_Unlink(*args, **kwargs)
+    def base_OnDraw(*args, **kwargs): return _ogl.PyLineShape_base_OnDraw(*args, **kwargs)
+    def base_OnDrawContents(*args, **kwargs): return _ogl.PyLineShape_base_OnDrawContents(*args, **kwargs)
+    def base_OnDrawBranches(*args, **kwargs): return _ogl.PyLineShape_base_OnDrawBranches(*args, **kwargs)
+    def base_OnMoveLinks(*args, **kwargs): return _ogl.PyLineShape_base_OnMoveLinks(*args, **kwargs)
+    def base_OnErase(*args, **kwargs): return _ogl.PyLineShape_base_OnErase(*args, **kwargs)
+    def base_OnEraseContents(*args, **kwargs): return _ogl.PyLineShape_base_OnEraseContents(*args, **kwargs)
+    def base_OnHighlight(*args, **kwargs): return _ogl.PyLineShape_base_OnHighlight(*args, **kwargs)
+    def base_OnLeftClick(*args, **kwargs): return _ogl.PyLineShape_base_OnLeftClick(*args, **kwargs)
+    def base_OnLeftDoubleClick(*args, **kwargs): return _ogl.PyLineShape_base_OnLeftDoubleClick(*args, **kwargs)
+    def base_OnRightClick(*args, **kwargs): return _ogl.PyLineShape_base_OnRightClick(*args, **kwargs)
+    def base_OnSize(*args, **kwargs): return _ogl.PyLineShape_base_OnSize(*args, **kwargs)
+    def base_OnMovePre(*args, **kwargs): return _ogl.PyLineShape_base_OnMovePre(*args, **kwargs)
+    def base_OnMovePost(*args, **kwargs): return _ogl.PyLineShape_base_OnMovePost(*args, **kwargs)
+    def base_OnDragLeft(*args, **kwargs): return _ogl.PyLineShape_base_OnDragLeft(*args, **kwargs)
+    def base_OnBeginDragLeft(*args, **kwargs): return _ogl.PyLineShape_base_OnBeginDragLeft(*args, **kwargs)
+    def base_OnEndDragLeft(*args, **kwargs): return _ogl.PyLineShape_base_OnEndDragLeft(*args, **kwargs)
+    def base_OnDragRight(*args, **kwargs): return _ogl.PyLineShape_base_OnDragRight(*args, **kwargs)
+    def base_OnBeginDragRight(*args, **kwargs): return _ogl.PyLineShape_base_OnBeginDragRight(*args, **kwargs)
+    def base_OnEndDragRight(*args, **kwargs): return _ogl.PyLineShape_base_OnEndDragRight(*args, **kwargs)
+    def base_OnDrawOutline(*args, **kwargs): return _ogl.PyLineShape_base_OnDrawOutline(*args, **kwargs)
+    def base_OnDrawControlPoints(*args, **kwargs): return _ogl.PyLineShape_base_OnDrawControlPoints(*args, **kwargs)
+    def base_OnEraseControlPoints(*args, **kwargs): return _ogl.PyLineShape_base_OnEraseControlPoints(*args, **kwargs)
+    def base_OnMoveLink(*args, **kwargs): return _ogl.PyLineShape_base_OnMoveLink(*args, **kwargs)
+    def base_OnSizingDragLeft(*args, **kwargs): return _ogl.PyLineShape_base_OnSizingDragLeft(*args, **kwargs)
+    def base_OnSizingBeginDragLeft(*args, **kwargs): return _ogl.PyLineShape_base_OnSizingBeginDragLeft(*args, **kwargs)
+    def base_OnSizingEndDragLeft(*args, **kwargs): return _ogl.PyLineShape_base_OnSizingEndDragLeft(*args, **kwargs)
+    def base_OnBeginSize(*args, **kwargs): return _ogl.PyLineShape_base_OnBeginSize(*args, **kwargs)
+    def base_OnEndSize(*args, **kwargs): return _ogl.PyLineShape_base_OnEndSize(*args, **kwargs)
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyLineShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+class PyLineShapePtr(PyLineShape):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = PyLineShape
+_ogl.PyLineShape_swigregister(PyLineShapePtr)
+
+class PyPolygonShape(PyShape):
+    def __init__(self, *args, **kwargs):
+        newobj = _ogl.new_PyPolygonShape(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+        self._setOORandCallbackInfo(PyPolygonShape)
+    def _setCallbackInfo(*args, **kwargs): return _ogl.PyPolygonShape__setCallbackInfo(*args, **kwargs)
+    def Create(*args, **kwargs): return _ogl.PyPolygonShape_Create(*args, **kwargs)
+    def AddPolygonPoint(*args, **kwargs): return _ogl.PyPolygonShape_AddPolygonPoint(*args, **kwargs)
+    def CalculatePolygonCentre(*args, **kwargs): return _ogl.PyPolygonShape_CalculatePolygonCentre(*args, **kwargs)
+    def DeletePolygonPoint(*args, **kwargs): return _ogl.PyPolygonShape_DeletePolygonPoint(*args, **kwargs)
+    def GetPoints(*args, **kwargs): return _ogl.PyPolygonShape_GetPoints(*args, **kwargs)
+    def UpdateOriginalPoints(*args, **kwargs): return _ogl.PyPolygonShape_UpdateOriginalPoints(*args, **kwargs)
+    def base_OnDraw(*args, **kwargs): return _ogl.PyPolygonShape_base_OnDraw(*args, **kwargs)
+    def base_OnDrawContents(*args, **kwargs): return _ogl.PyPolygonShape_base_OnDrawContents(*args, **kwargs)
+    def base_OnDrawBranches(*args, **kwargs): return _ogl.PyPolygonShape_base_OnDrawBranches(*args, **kwargs)
+    def base_OnMoveLinks(*args, **kwargs): return _ogl.PyPolygonShape_base_OnMoveLinks(*args, **kwargs)
+    def base_OnErase(*args, **kwargs): return _ogl.PyPolygonShape_base_OnErase(*args, **kwargs)
+    def base_OnEraseContents(*args, **kwargs): return _ogl.PyPolygonShape_base_OnEraseContents(*args, **kwargs)
+    def base_OnHighlight(*args, **kwargs): return _ogl.PyPolygonShape_base_OnHighlight(*args, **kwargs)
+    def base_OnLeftClick(*args, **kwargs): return _ogl.PyPolygonShape_base_OnLeftClick(*args, **kwargs)
+    def base_OnLeftDoubleClick(*args, **kwargs): return _ogl.PyPolygonShape_base_OnLeftDoubleClick(*args, **kwargs)
+    def base_OnRightClick(*args, **kwargs): return _ogl.PyPolygonShape_base_OnRightClick(*args, **kwargs)
+    def base_OnSize(*args, **kwargs): return _ogl.PyPolygonShape_base_OnSize(*args, **kwargs)
+    def base_OnMovePre(*args, **kwargs): return _ogl.PyPolygonShape_base_OnMovePre(*args, **kwargs)
+    def base_OnMovePost(*args, **kwargs): return _ogl.PyPolygonShape_base_OnMovePost(*args, **kwargs)
+    def base_OnDragLeft(*args, **kwargs): return _ogl.PyPolygonShape_base_OnDragLeft(*args, **kwargs)
+    def base_OnBeginDragLeft(*args, **kwargs): return _ogl.PyPolygonShape_base_OnBeginDragLeft(*args, **kwargs)
+    def base_OnEndDragLeft(*args, **kwargs): return _ogl.PyPolygonShape_base_OnEndDragLeft(*args, **kwargs)
+    def base_OnDragRight(*args, **kwargs): return _ogl.PyPolygonShape_base_OnDragRight(*args, **kwargs)
+    def base_OnBeginDragRight(*args, **kwargs): return _ogl.PyPolygonShape_base_OnBeginDragRight(*args, **kwargs)
+    def base_OnEndDragRight(*args, **kwargs): return _ogl.PyPolygonShape_base_OnEndDragRight(*args, **kwargs)
+    def base_OnDrawOutline(*args, **kwargs): return _ogl.PyPolygonShape_base_OnDrawOutline(*args, **kwargs)
+    def base_OnDrawControlPoints(*args, **kwargs): return _ogl.PyPolygonShape_base_OnDrawControlPoints(*args, **kwargs)
+    def base_OnEraseControlPoints(*args, **kwargs): return _ogl.PyPolygonShape_base_OnEraseControlPoints(*args, **kwargs)
+    def base_OnMoveLink(*args, **kwargs): return _ogl.PyPolygonShape_base_OnMoveLink(*args, **kwargs)
+    def base_OnSizingDragLeft(*args, **kwargs): return _ogl.PyPolygonShape_base_OnSizingDragLeft(*args, **kwargs)
+    def base_OnSizingBeginDragLeft(*args, **kwargs): return _ogl.PyPolygonShape_base_OnSizingBeginDragLeft(*args, **kwargs)
+    def base_OnSizingEndDragLeft(*args, **kwargs): return _ogl.PyPolygonShape_base_OnSizingEndDragLeft(*args, **kwargs)
+    def base_OnBeginSize(*args, **kwargs): return _ogl.PyPolygonShape_base_OnBeginSize(*args, **kwargs)
+    def base_OnEndSize(*args, **kwargs): return _ogl.PyPolygonShape_base_OnEndSize(*args, **kwargs)
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyPolygonShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+class PyPolygonShapePtr(PyPolygonShape):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = PyPolygonShape
+_ogl.PyPolygonShape_swigregister(PyPolygonShapePtr)
+
+class PyTextShape(PyRectangleShape):
+    def __init__(self, *args, **kwargs):
+        newobj = _ogl.new_PyTextShape(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+        self._setOORandCallbackInfo(PyTextShape)
+    def _setCallbackInfo(*args, **kwargs): return _ogl.PyTextShape__setCallbackInfo(*args, **kwargs)
+    def base_OnDelete(*args, **kwargs): return _ogl.PyTextShape_base_OnDelete(*args, **kwargs)
+    def base_OnDraw(*args, **kwargs): return _ogl.PyTextShape_base_OnDraw(*args, **kwargs)
+    def base_OnDrawContents(*args, **kwargs): return _ogl.PyTextShape_base_OnDrawContents(*args, **kwargs)
+    def base_OnDrawBranches(*args, **kwargs): return _ogl.PyTextShape_base_OnDrawBranches(*args, **kwargs)
+    def base_OnMoveLinks(*args, **kwargs): return _ogl.PyTextShape_base_OnMoveLinks(*args, **kwargs)
+    def base_OnErase(*args, **kwargs): return _ogl.PyTextShape_base_OnErase(*args, **kwargs)
+    def base_OnEraseContents(*args, **kwargs): return _ogl.PyTextShape_base_OnEraseContents(*args, **kwargs)
+    def base_OnHighlight(*args, **kwargs): return _ogl.PyTextShape_base_OnHighlight(*args, **kwargs)
+    def base_OnLeftClick(*args, **kwargs): return _ogl.PyTextShape_base_OnLeftClick(*args, **kwargs)
+    def base_OnLeftDoubleClick(*args, **kwargs): return _ogl.PyTextShape_base_OnLeftDoubleClick(*args, **kwargs)
+    def base_OnRightClick(*args, **kwargs): return _ogl.PyTextShape_base_OnRightClick(*args, **kwargs)
+    def base_OnSize(*args, **kwargs): return _ogl.PyTextShape_base_OnSize(*args, **kwargs)
+    def base_OnMovePre(*args, **kwargs): return _ogl.PyTextShape_base_OnMovePre(*args, **kwargs)
+    def base_OnMovePost(*args, **kwargs): return _ogl.PyTextShape_base_OnMovePost(*args, **kwargs)
+    def base_OnDragLeft(*args, **kwargs): return _ogl.PyTextShape_base_OnDragLeft(*args, **kwargs)
+    def base_OnBeginDragLeft(*args, **kwargs): return _ogl.PyTextShape_base_OnBeginDragLeft(*args, **kwargs)
+    def base_OnEndDragLeft(*args, **kwargs): return _ogl.PyTextShape_base_OnEndDragLeft(*args, **kwargs)
+    def base_OnDragRight(*args, **kwargs): return _ogl.PyTextShape_base_OnDragRight(*args, **kwargs)
+    def base_OnBeginDragRight(*args, **kwargs): return _ogl.PyTextShape_base_OnBeginDragRight(*args, **kwargs)
+    def base_OnEndDragRight(*args, **kwargs): return _ogl.PyTextShape_base_OnEndDragRight(*args, **kwargs)
+    def base_OnDrawOutline(*args, **kwargs): return _ogl.PyTextShape_base_OnDrawOutline(*args, **kwargs)
+    def base_OnDrawControlPoints(*args, **kwargs): return _ogl.PyTextShape_base_OnDrawControlPoints(*args, **kwargs)
+    def base_OnEraseControlPoints(*args, **kwargs): return _ogl.PyTextShape_base_OnEraseControlPoints(*args, **kwargs)
+    def base_OnMoveLink(*args, **kwargs): return _ogl.PyTextShape_base_OnMoveLink(*args, **kwargs)
+    def base_OnSizingDragLeft(*args, **kwargs): return _ogl.PyTextShape_base_OnSizingDragLeft(*args, **kwargs)
+    def base_OnSizingBeginDragLeft(*args, **kwargs): return _ogl.PyTextShape_base_OnSizingBeginDragLeft(*args, **kwargs)
+    def base_OnSizingEndDragLeft(*args, **kwargs): return _ogl.PyTextShape_base_OnSizingEndDragLeft(*args, **kwargs)
+    def base_OnBeginSize(*args, **kwargs): return _ogl.PyTextShape_base_OnBeginSize(*args, **kwargs)
+    def base_OnEndSize(*args, **kwargs): return _ogl.PyTextShape_base_OnEndSize(*args, **kwargs)
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyTextShape instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+class PyTextShapePtr(PyTextShape):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = PyTextShape
+_ogl.PyTextShape_swigregister(PyTextShapePtr)
+
+class Diagram(core.Object):
+    def __init__(self, *args, **kwargs):
+        newobj = _ogl.new_Diagram(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+    def AddShape(*args, **kwargs): return _ogl.Diagram_AddShape(*args, **kwargs)
+    def Clear(*args, **kwargs): return _ogl.Diagram_Clear(*args, **kwargs)
+    def DeleteAllShapes(*args, **kwargs): return _ogl.Diagram_DeleteAllShapes(*args, **kwargs)
+    def DrawOutline(*args, **kwargs): return _ogl.Diagram_DrawOutline(*args, **kwargs)
+    def FindShape(*args, **kwargs): return _ogl.Diagram_FindShape(*args, **kwargs)
+    def GetCanvas(*args, **kwargs): return _ogl.Diagram_GetCanvas(*args, **kwargs)
+    def GetCount(*args, **kwargs): return _ogl.Diagram_GetCount(*args, **kwargs)
+    def GetGridSpacing(*args, **kwargs): return _ogl.Diagram_GetGridSpacing(*args, **kwargs)
+    def GetMouseTolerance(*args, **kwargs): return _ogl.Diagram_GetMouseTolerance(*args, **kwargs)
+    def GetShapeList(*args, **kwargs): return _ogl.Diagram_GetShapeList(*args, **kwargs)
+    def GetQuickEditMode(*args, **kwargs): return _ogl.Diagram_GetQuickEditMode(*args, **kwargs)
+    def GetSnapToGrid(*args, **kwargs): return _ogl.Diagram_GetSnapToGrid(*args, **kwargs)
+    def InsertShape(*args, **kwargs): return _ogl.Diagram_InsertShape(*args, **kwargs)
+    def RecentreAll(*args, **kwargs): return _ogl.Diagram_RecentreAll(*args, **kwargs)
+    def Redraw(*args, **kwargs): return _ogl.Diagram_Redraw(*args, **kwargs)
+    def RemoveAllShapes(*args, **kwargs): return _ogl.Diagram_RemoveAllShapes(*args, **kwargs)
+    def RemoveShape(*args, **kwargs): return _ogl.Diagram_RemoveShape(*args, **kwargs)
+    def SetCanvas(*args, **kwargs): return _ogl.Diagram_SetCanvas(*args, **kwargs)
+    def SetGridSpacing(*args, **kwargs): return _ogl.Diagram_SetGridSpacing(*args, **kwargs)
+    def SetMouseTolerance(*args, **kwargs): return _ogl.Diagram_SetMouseTolerance(*args, **kwargs)
+    def SetQuickEditMode(*args, **kwargs): return _ogl.Diagram_SetQuickEditMode(*args, **kwargs)
+    def SetSnapToGrid(*args, **kwargs): return _ogl.Diagram_SetSnapToGrid(*args, **kwargs)
+    def ShowAll(*args, **kwargs): return _ogl.Diagram_ShowAll(*args, **kwargs)
+    def Snap(*args, **kwargs): return _ogl.Diagram_Snap(*args, **kwargs)
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxDiagram instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+class DiagramPtr(Diagram):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = Diagram
+_ogl.Diagram_swigregister(DiagramPtr)
+
+class PyShapeCanvas(windows.ScrolledWindow):
+    def __init__(self, *args, **kwargs):
+        newobj = _ogl.new_PyShapeCanvas(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+    def _setCallbackInfo(*args, **kwargs): return _ogl.PyShapeCanvas__setCallbackInfo(*args, **kwargs)
+    def _setOORandCallbackInfo(self, _class):
+        self._setOORInfo(self)
+        self._setCallbackInfo(self, _class)
+
+    def AddShape(*args, **kwargs): return _ogl.PyShapeCanvas_AddShape(*args, **kwargs)
+    def FindShape(*args, **kwargs): return _ogl.PyShapeCanvas_FindShape(*args, **kwargs)
+    def FindFirstSensitiveShape(*args, **kwargs): return _ogl.PyShapeCanvas_FindFirstSensitiveShape(*args, **kwargs)
+    def GetDiagram(*args, **kwargs): return _ogl.PyShapeCanvas_GetDiagram(*args, **kwargs)
+    def GetQuickEditMode(*args, **kwargs): return _ogl.PyShapeCanvas_GetQuickEditMode(*args, **kwargs)
+    def InsertShape(*args, **kwargs): return _ogl.PyShapeCanvas_InsertShape(*args, **kwargs)
+    def base_OnBeginDragLeft(*args, **kwargs): return _ogl.PyShapeCanvas_base_OnBeginDragLeft(*args, **kwargs)
+    def base_OnBeginDragRight(*args, **kwargs): return _ogl.PyShapeCanvas_base_OnBeginDragRight(*args, **kwargs)
+    def base_OnEndDragLeft(*args, **kwargs): return _ogl.PyShapeCanvas_base_OnEndDragLeft(*args, **kwargs)
+    def base_OnEndDragRight(*args, **kwargs): return _ogl.PyShapeCanvas_base_OnEndDragRight(*args, **kwargs)
+    def base_OnDragLeft(*args, **kwargs): return _ogl.PyShapeCanvas_base_OnDragLeft(*args, **kwargs)
+    def base_OnDragRight(*args, **kwargs): return _ogl.PyShapeCanvas_base_OnDragRight(*args, **kwargs)
+    def base_OnLeftClick(*args, **kwargs): return _ogl.PyShapeCanvas_base_OnLeftClick(*args, **kwargs)
+    def base_OnRightClick(*args, **kwargs): return _ogl.PyShapeCanvas_base_OnRightClick(*args, **kwargs)
+    def Redraw(*args, **kwargs): return _ogl.PyShapeCanvas_Redraw(*args, **kwargs)
+    def RemoveShape(*args, **kwargs): return _ogl.PyShapeCanvas_RemoveShape(*args, **kwargs)
+    def SetDiagram(*args, **kwargs): return _ogl.PyShapeCanvas_SetDiagram(*args, **kwargs)
+    def Snap(*args, **kwargs): return _ogl.PyShapeCanvas_Snap(*args, **kwargs)
+    def GetShapeList(self):
+        return self.GetDiagram().GetShapeList()
+
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyShapeCanvas instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+class PyShapeCanvasPtr(PyShapeCanvas):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = PyShapeCanvas
+_ogl.PyShapeCanvas_swigregister(PyShapeCanvasPtr)
+
+# Aliases    
+ShapeCanvas =       PyShapeCanvas
+ShapeEvtHandler =   PyShapeEvtHandler
+Shape =             PyShape
+RectangleShape =    PyRectangleShape
+BitmapShape =       PyBitmapShape
+DrawnShape =        PyDrawnShape
+CompositeShape =    PyCompositeShape
+DividedShape =      PyDividedShape
+DivisionShape =     PyDivisionShape
+EllipseShape =      PyEllipseShape
+CircleShape =       PyCircleShape
+LineShape =         PyLineShape
+PolygonShape =      PyPolygonShape
+TextShape =         PyTextShape
+ControlPoint =      PyControlPoint
+
+KEY_SHIFT = _ogl.KEY_SHIFT
+KEY_CTRL = _ogl.KEY_CTRL
+ARROW_NONE = _ogl.ARROW_NONE
+ARROW_END = _ogl.ARROW_END
+ARROW_BOTH = _ogl.ARROW_BOTH
+ARROW_MIDDLE = _ogl.ARROW_MIDDLE
+ARROW_START = _ogl.ARROW_START
+ARROW_HOLLOW_CIRCLE = _ogl.ARROW_HOLLOW_CIRCLE
+ARROW_FILLED_CIRCLE = _ogl.ARROW_FILLED_CIRCLE
+ARROW_ARROW = _ogl.ARROW_ARROW
+ARROW_SINGLE_OBLIQUE = _ogl.ARROW_SINGLE_OBLIQUE
+ARROW_DOUBLE_OBLIQUE = _ogl.ARROW_DOUBLE_OBLIQUE
+ARROW_METAFILE = _ogl.ARROW_METAFILE
+ARROW_POSITION_END = _ogl.ARROW_POSITION_END
+ARROW_POSITION_START = _ogl.ARROW_POSITION_START
+CONTROL_POINT_VERTICAL = _ogl.CONTROL_POINT_VERTICAL
+CONTROL_POINT_HORIZONTAL = _ogl.CONTROL_POINT_HORIZONTAL
+CONTROL_POINT_DIAGONAL = _ogl.CONTROL_POINT_DIAGONAL
+CONTROL_POINT_ENDPOINT_TO = _ogl.CONTROL_POINT_ENDPOINT_TO
+CONTROL_POINT_ENDPOINT_FROM = _ogl.CONTROL_POINT_ENDPOINT_FROM
+CONTROL_POINT_LINE = _ogl.CONTROL_POINT_LINE
+FORMAT_NONE = _ogl.FORMAT_NONE
+FORMAT_CENTRE_HORIZ = _ogl.FORMAT_CENTRE_HORIZ
+FORMAT_CENTRE_VERT = _ogl.FORMAT_CENTRE_VERT
+FORMAT_SIZE_TO_CONTENTS = _ogl.FORMAT_SIZE_TO_CONTENTS
+LINE_ALIGNMENT_HORIZ = _ogl.LINE_ALIGNMENT_HORIZ
+LINE_ALIGNMENT_VERT = _ogl.LINE_ALIGNMENT_VERT
+LINE_ALIGNMENT_TO_NEXT_HANDLE = _ogl.LINE_ALIGNMENT_TO_NEXT_HANDLE
+LINE_ALIGNMENT_NONE = _ogl.LINE_ALIGNMENT_NONE
+SHADOW_NONE = _ogl.SHADOW_NONE
+SHADOW_LEFT = _ogl.SHADOW_LEFT
+SHADOW_RIGHT = _ogl.SHADOW_RIGHT
+OP_CLICK_LEFT = _ogl.OP_CLICK_LEFT
+OP_CLICK_RIGHT = _ogl.OP_CLICK_RIGHT
+OP_DRAG_LEFT = _ogl.OP_DRAG_LEFT
+OP_DRAG_RIGHT = _ogl.OP_DRAG_RIGHT
+OP_ALL = _ogl.OP_ALL
+ATTACHMENT_MODE_NONE = _ogl.ATTACHMENT_MODE_NONE
+ATTACHMENT_MODE_EDGE = _ogl.ATTACHMENT_MODE_EDGE
+ATTACHMENT_MODE_BRANCHING = _ogl.ATTACHMENT_MODE_BRANCHING
+BRANCHING_ATTACHMENT_NORMAL = _ogl.BRANCHING_ATTACHMENT_NORMAL
+BRANCHING_ATTACHMENT_BLOB = _ogl.BRANCHING_ATTACHMENT_BLOB
+gyCONSTRAINT_CENTRED_VERTICALLY = _ogl.gyCONSTRAINT_CENTRED_VERTICALLY
+gyCONSTRAINT_CENTRED_HORIZONTALLY = _ogl.gyCONSTRAINT_CENTRED_HORIZONTALLY
+gyCONSTRAINT_CENTRED_BOTH = _ogl.gyCONSTRAINT_CENTRED_BOTH
+gyCONSTRAINT_LEFT_OF = _ogl.gyCONSTRAINT_LEFT_OF
+gyCONSTRAINT_RIGHT_OF = _ogl.gyCONSTRAINT_RIGHT_OF
+gyCONSTRAINT_ABOVE = _ogl.gyCONSTRAINT_ABOVE
+gyCONSTRAINT_BELOW = _ogl.gyCONSTRAINT_BELOW
+gyCONSTRAINT_ALIGNED_TOP = _ogl.gyCONSTRAINT_ALIGNED_TOP
+gyCONSTRAINT_ALIGNED_BOTTOM = _ogl.gyCONSTRAINT_ALIGNED_BOTTOM
+gyCONSTRAINT_ALIGNED_LEFT = _ogl.gyCONSTRAINT_ALIGNED_LEFT
+gyCONSTRAINT_ALIGNED_RIGHT = _ogl.gyCONSTRAINT_ALIGNED_RIGHT
+gyCONSTRAINT_MIDALIGNED_TOP = _ogl.gyCONSTRAINT_MIDALIGNED_TOP
+gyCONSTRAINT_MIDALIGNED_BOTTOM = _ogl.gyCONSTRAINT_MIDALIGNED_BOTTOM
+gyCONSTRAINT_MIDALIGNED_LEFT = _ogl.gyCONSTRAINT_MIDALIGNED_LEFT
+gyCONSTRAINT_MIDALIGNED_RIGHT = _ogl.gyCONSTRAINT_MIDALIGNED_RIGHT
+DIVISION_SIDE_NONE = _ogl.DIVISION_SIDE_NONE
+DIVISION_SIDE_LEFT = _ogl.DIVISION_SIDE_LEFT
+DIVISION_SIDE_TOP = _ogl.DIVISION_SIDE_TOP
+DIVISION_SIDE_RIGHT = _ogl.DIVISION_SIDE_RIGHT
+DIVISION_SIDE_BOTTOM = _ogl.DIVISION_SIDE_BOTTOM
+
+OGLInitialize = _ogl.OGLInitialize
+
+OGLCleanUp = _ogl.OGLCleanUp
 
-#-------------- FUNCTION WRAPPERS ------------------
-
-wxOGLInitialize = oglc.wxOGLInitialize
-
-wxOGLCleanUp = oglc.wxOGLCleanUp
-
-
-
-#-------------- VARIABLE WRAPPERS ------------------
-
-KEY_SHIFT = oglc.KEY_SHIFT
-KEY_CTRL = oglc.KEY_CTRL
-ARROW_NONE = oglc.ARROW_NONE
-ARROW_END = oglc.ARROW_END
-ARROW_BOTH = oglc.ARROW_BOTH
-ARROW_MIDDLE = oglc.ARROW_MIDDLE
-ARROW_START = oglc.ARROW_START
-ARROW_HOLLOW_CIRCLE = oglc.ARROW_HOLLOW_CIRCLE
-ARROW_FILLED_CIRCLE = oglc.ARROW_FILLED_CIRCLE
-ARROW_ARROW = oglc.ARROW_ARROW
-ARROW_SINGLE_OBLIQUE = oglc.ARROW_SINGLE_OBLIQUE
-ARROW_DOUBLE_OBLIQUE = oglc.ARROW_DOUBLE_OBLIQUE
-ARROW_METAFILE = oglc.ARROW_METAFILE
-ARROW_POSITION_END = oglc.ARROW_POSITION_END
-ARROW_POSITION_START = oglc.ARROW_POSITION_START
-CONTROL_POINT_VERTICAL = oglc.CONTROL_POINT_VERTICAL
-CONTROL_POINT_HORIZONTAL = oglc.CONTROL_POINT_HORIZONTAL
-CONTROL_POINT_DIAGONAL = oglc.CONTROL_POINT_DIAGONAL
-CONTROL_POINT_ENDPOINT_TO = oglc.CONTROL_POINT_ENDPOINT_TO
-CONTROL_POINT_ENDPOINT_FROM = oglc.CONTROL_POINT_ENDPOINT_FROM
-CONTROL_POINT_LINE = oglc.CONTROL_POINT_LINE
-FORMAT_NONE = oglc.FORMAT_NONE
-FORMAT_CENTRE_HORIZ = oglc.FORMAT_CENTRE_HORIZ
-FORMAT_CENTRE_VERT = oglc.FORMAT_CENTRE_VERT
-FORMAT_SIZE_TO_CONTENTS = oglc.FORMAT_SIZE_TO_CONTENTS
-LINE_ALIGNMENT_HORIZ = oglc.LINE_ALIGNMENT_HORIZ
-LINE_ALIGNMENT_VERT = oglc.LINE_ALIGNMENT_VERT
-LINE_ALIGNMENT_TO_NEXT_HANDLE = oglc.LINE_ALIGNMENT_TO_NEXT_HANDLE
-LINE_ALIGNMENT_NONE = oglc.LINE_ALIGNMENT_NONE
-SHADOW_NONE = oglc.SHADOW_NONE
-SHADOW_LEFT = oglc.SHADOW_LEFT
-SHADOW_RIGHT = oglc.SHADOW_RIGHT
-OP_CLICK_LEFT = oglc.OP_CLICK_LEFT
-OP_CLICK_RIGHT = oglc.OP_CLICK_RIGHT
-OP_DRAG_LEFT = oglc.OP_DRAG_LEFT
-OP_DRAG_RIGHT = oglc.OP_DRAG_RIGHT
-OP_ALL = oglc.OP_ALL
-ATTACHMENT_MODE_NONE = oglc.ATTACHMENT_MODE_NONE
-ATTACHMENT_MODE_EDGE = oglc.ATTACHMENT_MODE_EDGE
-ATTACHMENT_MODE_BRANCHING = oglc.ATTACHMENT_MODE_BRANCHING
-BRANCHING_ATTACHMENT_NORMAL = oglc.BRANCHING_ATTACHMENT_NORMAL
-BRANCHING_ATTACHMENT_BLOB = oglc.BRANCHING_ATTACHMENT_BLOB
-gyCONSTRAINT_CENTRED_VERTICALLY = oglc.gyCONSTRAINT_CENTRED_VERTICALLY
-gyCONSTRAINT_CENTRED_HORIZONTALLY = oglc.gyCONSTRAINT_CENTRED_HORIZONTALLY
-gyCONSTRAINT_CENTRED_BOTH = oglc.gyCONSTRAINT_CENTRED_BOTH
-gyCONSTRAINT_LEFT_OF = oglc.gyCONSTRAINT_LEFT_OF
-gyCONSTRAINT_RIGHT_OF = oglc.gyCONSTRAINT_RIGHT_OF
-gyCONSTRAINT_ABOVE = oglc.gyCONSTRAINT_ABOVE
-gyCONSTRAINT_BELOW = oglc.gyCONSTRAINT_BELOW
-gyCONSTRAINT_ALIGNED_TOP = oglc.gyCONSTRAINT_ALIGNED_TOP
-gyCONSTRAINT_ALIGNED_BOTTOM = oglc.gyCONSTRAINT_ALIGNED_BOTTOM
-gyCONSTRAINT_ALIGNED_LEFT = oglc.gyCONSTRAINT_ALIGNED_LEFT
-gyCONSTRAINT_ALIGNED_RIGHT = oglc.gyCONSTRAINT_ALIGNED_RIGHT
-gyCONSTRAINT_MIDALIGNED_TOP = oglc.gyCONSTRAINT_MIDALIGNED_TOP
-gyCONSTRAINT_MIDALIGNED_BOTTOM = oglc.gyCONSTRAINT_MIDALIGNED_BOTTOM
-gyCONSTRAINT_MIDALIGNED_LEFT = oglc.gyCONSTRAINT_MIDALIGNED_LEFT
-gyCONSTRAINT_MIDALIGNED_RIGHT = oglc.gyCONSTRAINT_MIDALIGNED_RIGHT
-DIVISION_SIDE_NONE = oglc.DIVISION_SIDE_NONE
-DIVISION_SIDE_LEFT = oglc.DIVISION_SIDE_LEFT
-DIVISION_SIDE_TOP = oglc.DIVISION_SIDE_TOP
-DIVISION_SIDE_RIGHT = oglc.DIVISION_SIDE_RIGHT
-DIVISION_SIDE_BOTTOM = oglc.DIVISION_SIDE_BOTTOM
-
-
-#-------------- USER INCLUDE -----------------------
-
-
-# aliases
-wxShapeCanvas =       wxPyShapeCanvas
-wxShapeEvtHandler =   wxPyShapeEvtHandler
-wxShape =             wxPyShape
-wxRectangleShape =    wxPyRectangleShape
-wxBitmapShape =       wxPyBitmapShape
-wxDrawnShape =        wxPyDrawnShape
-wxCompositeShape =    wxPyCompositeShape
-wxDividedShape =      wxPyDividedShape
-wxDivisionShape =     wxPyDivisionShape
-wxEllipseShape =      wxPyEllipseShape
-wxCircleShape =       wxPyCircleShape
-wxLineShape =         wxPyLineShape
-wxPolygonShape =      wxPyPolygonShape
-wxTextShape =         wxPyTextShape
-wxControlPoint =      wxPyControlPoint
-
-# Stuff these names into the wx namespace so wxPyConstructObject can find them
-import wx
-wx.wxArrowHeadPtr         = wxArrowHeadPtr
-wx.wxControlPointPtr      = wxPyControlPointPtr
-wx.wxDiagramPtr           = wxDiagramPtr
-wx.wxOGLConstraintPtr     = wxOGLConstraintPtr
-wx.wxPseudoMetaFilePtr    = wxPseudoMetaFile
-wx.wxPyBitmapShapePtr     = wxPyBitmapShapePtr
-wx.wxPyCircleShapePtr     = wxPyCircleShapePtr
-wx.wxPyCompositeShapePtr  = wxPyCompositeShapePtr
-wx.wxPyControlPointPtr    = wxPyControlPointPtr
-wx.wxPyDividedShapePtr    = wxPyDividedShapePtr
-wx.wxPyDivisionShapePtr   = wxPyDivisionShapePtr
-wx.wxPyDrawnShapePtr      = wxPyDrawnShapePtr
-wx.wxPyEllipseShapePtr    = wxPyEllipseShapePtr
-wx.wxPyLineShapePtr       = wxPyLineShapePtr
-wx.wxPyPolygonShapePtr    = wxPyPolygonShapePtr
-wx.wxPyRectangleShapePtr  = wxPyRectangleShapePtr
-wx.wxPyShapeCanvasPtr     = wxPyShapeCanvasPtr
-wx.wxPyShapeEvtHandlerPtr = wxPyShapeEvtHandlerPtr
-wx.wxPyShapePtr           = wxPyShapePtr
-wx.wxPyTextShapePtr       = wxPyTextShapePtr
-wx.wxShapeRegionPtr       = wxShapeRegionPtr