Merged the wxPy_newswig branch into the HEAD branch (main trunk)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

wxPython/demo/wxOGL.py

@@ -4,10 +4,7 @@ from wxPython.ogl import *
 
 import images
 
-#----------------------------------------------------------------------
-# This creates some pens and brushes that the OGL library uses.
-
-wxOGLInitialize()
+##wxTrap()
 
 #----------------------------------------------------------------------
 
@@ -83,6 +80,7 @@ class DividedShape(wxDividedShape):
 
 
     def OnSizingEndDragLeft(self, pt, x, y, keys, attch):
+        print "***", self
         self.base_OnSizingEndDragLeft(pt, x, y, keys, attch)
         self.SetRegionSizes()
         self.ReformatRegions()
@@ -257,6 +255,11 @@ class TestWindow(wxShapeCanvas):
 #----------------------------------------------------------------------
 
 def runTest(frame, nb, log):
+    # This creates some pens and brushes that the OGL library uses.
+    # It should be called after the app object has been created, but
+    # before OGL is used.
+    wxOGLInitialize()
+
     win = TestWindow(nb, log, frame)
     return win