linux fixes

[wxWidgets.git] / utils / wxPython / demo / wxGLCanvas.py

diff --git a/utils/wxPython/demo/wxGLCanvas.py b/utils/wxPython/demo/wxGLCanvas.py
index 306cdd46f087f4823ecaa3f914c0da300dbeca0c..8aada33c1f9d97de825925972a7eeca98348a77b 100644 (file)
--- a/utils/wxPython/demo/wxGLCanvas.py
+++ b/utils/wxPython/demo/wxGLCanvas.py
@@ -2,12 +2,19 @@
 from wxPython.wx       import *
 try:
     from wxPython.glcanvas import *
 from wxPython.wx       import *
 try:
     from wxPython.glcanvas import *

-    from OpenGL.GL import *
-    from OpenGL.GLUT import *

     haveGLCanvas = true
 except ImportError:
     haveGLCanvas = false
 
     haveGLCanvas = true
 except ImportError:
     haveGLCanvas = false
 

+try:
+    # The Python OpenGL package can be found at
+    # http://starship.python.net:9673/crew/da/Code/PyOpenGL/
+    from OpenGL.GL import *
+    from OpenGL.GLUT import *
+    haveOpenGL = true
+except ImportError:
+    haveOpenGL = false
+

 #----------------------------------------------------------------------
 
 if not haveGLCanvas:
 #----------------------------------------------------------------------
 
 if not haveGLCanvas:


@@ -17,9 +24,17 @@ if not haveGLCanvas:
         dlg.ShowModal()
         dlg.Destroy()
 
         dlg.ShowModal()
         dlg.Destroy()
 

-else:
+elif not haveOpenGL:
+    def runTest(frame, nb, log):
+        dlg = wxMessageDialog(frame,
+                              'The OpenGL package was not found.  You can get it at\n'
+                              'http://starship.python.net:9673/crew/da/Code/PyOpenGL/',
+                          'Sorry', wxOK | wxICON_INFORMATION)
+        dlg.ShowModal()
+        dlg.Destroy()

 
 
 
 

+else:

     def runTest(frame, nb, log):
         win = wxFrame(frame, -1, "GL Demos", wxDefaultPosition, wxSize(300,300))
         CubeCanvas(win)
     def runTest(frame, nb, log):
         win = wxFrame(frame, -1, "GL Demos", wxDefaultPosition, wxSize(300,300))
         CubeCanvas(win)


@@ -51,6 +66,7 @@ else:
 
         def OnSize(self, event):
             size = self.GetClientSize()
 
         def OnSize(self, event):
             size = self.GetClientSize()

+            print size

             if self.GetContext():
                 self.SetCurrent()
                 glViewport(0, 0, size.width, size.height)
             if self.GetContext():
                 self.SetCurrent()
                 glViewport(0, 0, size.width, size.height)


@@ -60,6 +76,7 @@ else:
             dc = wxPaintDC(self)
 
             self.SetCurrent()
             dc = wxPaintDC(self)
 
             self.SetCurrent()

+            print self.init

 
             if not self.init:
                 self.InitGL()
 
             if not self.init:
                 self.InitGL()