Always set background colour prior to any HTML rendering (this fixes assert in GTK2...

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

diff --git a/wxPython/contrib/ogl/ogl.py b/wxPython/contrib/ogl/ogl.py
index 5c3b81333d99f078118c4ad97c1d6235107a010d..c9c932a09d263c4c054e41f0998edc2995d7980d 100644 (file)
--- a/wxPython/contrib/ogl/ogl.py
+++ b/wxPython/contrib/ogl/ogl.py
@@ -9,12 +9,16 @@ from windows import *
 
 from gdi import *
 
+from fonts import *
+
 from clip_dnd import *
 
 from events import *
 
 from streams import *
 
+from utils import *
+
 from mdi import *
 
 from frames import *
@@ -39,8 +43,6 @@ from sizers import *
 
 from filesys import *
 
-from utils import *
-
 from oglbasic import *
 
 from oglshapes import *
@@ -128,6 +130,7 @@ DIVISION_SIDE_BOTTOM = oglc.DIVISION_SIDE_BOTTOM
 #-------------- USER INCLUDE -----------------------
 
 
+# aliases
 wxShapeCanvas =       wxPyShapeCanvas
 wxShapeEvtHandler =   wxPyShapeEvtHandler
 wxShape =             wxPyShape
@@ -146,20 +149,24 @@ wxControlPoint =      wxPyControlPoint
 
 # 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.wxPyDrawnShapePtr      = wxPyDrawnShapePtr
+wx.wxPyCircleShapePtr     = wxPyCircleShapePtr
 wx.wxPyCompositeShapePtr  = wxPyCompositeShapePtr
+wx.wxPyControlPointPtr    = wxPyControlPointPtr
 wx.wxPyDividedShapePtr    = wxPyDividedShapePtr
 wx.wxPyDivisionShapePtr   = wxPyDivisionShapePtr
+wx.wxPyDrawnShapePtr      = wxPyDrawnShapePtr
 wx.wxPyEllipseShapePtr    = wxPyEllipseShapePtr
-wx.wxPyCircleShapePtr     = wxPyCircleShapePtr
 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.wxOGLConstraintPtr     = wxOGLConstraintPtr
-wx.wxControlPointPtr      = wxPyControlPointPtr