added default style wxFRAME_TOOL_WINDOW to creation

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

diff --git a/wxPython/contrib/ogl/ogl.py b/wxPython/contrib/ogl/ogl.py
index c896a7d261fec13c44dfee35222603dec1f79c14..cca62bc8d92a103bd685a3ac57b400eb4390041f 100644 (file)
--- a/wxPython/contrib/ogl/ogl.py
+++ b/wxPython/contrib/ogl/ogl.py
@@ -13,6 +13,10 @@ from clip_dnd import *
 
 from events import *
 
 
 from events import *
 

+from streams import *
+
+from utils import *
+

 from mdi import *
 
 from frames import *
 from mdi import *
 
 from frames import *


@@ -35,6 +39,8 @@ from printfw import *
 
 from sizers import *
 
 
 from sizers import *
 

+from filesys import *
+

 from oglbasic import *
 
 from oglshapes import *
 from oglbasic import *
 
 from oglshapes import *


@@ -122,6 +128,7 @@ DIVISION_SIDE_BOTTOM = oglc.DIVISION_SIDE_BOTTOM
 #-------------- USER INCLUDE -----------------------
 
 
 #-------------- USER INCLUDE -----------------------
 
 

+# aliases

 wxShapeCanvas =       wxPyShapeCanvas
 wxShapeEvtHandler =   wxPyShapeEvtHandler
 wxShape =             wxPyShape
 wxShapeCanvas =       wxPyShapeCanvas
 wxShapeEvtHandler =   wxPyShapeEvtHandler
 wxShape =             wxPyShape


@@ -140,20 +147,24 @@ wxControlPoint =      wxPyControlPoint
 
 # Stuff these names into the wx namespace so wxPyConstructObject can find them
 import wx
 
 # Stuff these names into the wx namespace so wxPyConstructObject can find them
 import wx

-wx.wxPyShapeCanvasPtr     = wxPyShapeCanvasPtr
-wx.wxPyShapeEvtHandlerPtr = wxPyShapeEvtHandlerPtr
-wx.wxPyShapePtr           = wxPyShapePtr
-wx.wxPyRectangleShapePtr  = wxPyRectangleShapePtr
+wx.wxArrowHeadPtr         = wxArrowHeadPtr
+wx.wxControlPointPtr      = wxPyControlPointPtr
+wx.wxDiagramPtr           = wxDiagramPtr
+wx.wxOGLConstraintPtr     = wxOGLConstraintPtr
+wx.wxPseudoMetaFilePtr    = wxPseudoMetaFile

 wx.wxPyBitmapShapePtr     = wxPyBitmapShapePtr
 wx.wxPyBitmapShapePtr     = wxPyBitmapShapePtr

-wx.wxPyDrawnShapePtr      = wxPyDrawnShapePtr
+wx.wxPyCircleShapePtr     = wxPyCircleShapePtr

 wx.wxPyCompositeShapePtr  = wxPyCompositeShapePtr
 wx.wxPyCompositeShapePtr  = wxPyCompositeShapePtr

+wx.wxPyControlPointPtr    = wxPyControlPointPtr

 wx.wxPyDividedShapePtr    = wxPyDividedShapePtr
 wx.wxPyDivisionShapePtr   = wxPyDivisionShapePtr
 wx.wxPyDividedShapePtr    = wxPyDividedShapePtr
 wx.wxPyDivisionShapePtr   = wxPyDivisionShapePtr

+wx.wxPyDrawnShapePtr      = wxPyDrawnShapePtr

 wx.wxPyEllipseShapePtr    = wxPyEllipseShapePtr
 wx.wxPyEllipseShapePtr    = wxPyEllipseShapePtr

-wx.wxPyCircleShapePtr     = wxPyCircleShapePtr

 wx.wxPyLineShapePtr       = wxPyLineShapePtr
 wx.wxPyPolygonShapePtr    = wxPyPolygonShapePtr
 wx.wxPyLineShapePtr       = wxPyLineShapePtr
 wx.wxPyPolygonShapePtr    = wxPyPolygonShapePtr

+wx.wxPyRectangleShapePtr  = wxPyRectangleShapePtr
+wx.wxPyShapeCanvasPtr     = wxPyShapeCanvasPtr
+wx.wxPyShapeEvtHandlerPtr = wxPyShapeEvtHandlerPtr
+wx.wxPyShapePtr           = wxPyShapePtr

 wx.wxPyTextShapePtr       = wxPyTextShapePtr
 wx.wxShapeRegionPtr       = wxShapeRegionPtr
 wx.wxPyTextShapePtr       = wxPyTextShapePtr
 wx.wxShapeRegionPtr       = wxShapeRegionPtr

-wx.wxOGLConstraintPtr     = wxOGLConstraintPtr
-wx.wxControlPointPtr      = wxPyControlPointPtr