fixed the last of the off-by-one errors (some are refixed, again...)

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

diff --git a/wxPython/demo/wxGLCanvas.py b/wxPython/demo/wxGLCanvas.py
index d6266f58142d054cff7ede27e40284e8e2849427..652b46dc37092080b00401ff981982d1c94f1b6a 100644 (file)
--- a/wxPython/demo/wxGLCanvas.py
+++ b/wxPython/demo/wxGLCanvas.py
@@ -8,7 +8,7 @@ except ImportError:
 
 try:
     # The Python OpenGL package can be found at
 
 try:
     # The Python OpenGL package can be found at

-    # http://starship.python.net:9673/crew/da/Code/PyOpenGL/
+    # http://PyOpenGL.sourceforge.net/

     from OpenGL.GL import *
     from OpenGL.GLUT import *
     haveOpenGL = true
     from OpenGL.GL import *
     from OpenGL.GLUT import *
     haveOpenGL = true


@@ -28,7 +28,7 @@ elif not haveOpenGL:
     def runTest(frame, nb, log):
         dlg = wxMessageDialog(frame,
                               'The OpenGL package was not found.  You can get it at\n'
     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/',
+                              'http://PyOpenGL.sourceforge.net/',

                           'Sorry', wxOK | wxICON_INFORMATION)
         dlg.ShowModal()
         dlg.Destroy()
                           'Sorry', wxOK | wxICON_INFORMATION)
         dlg.ShowModal()
         dlg.Destroy()


@@ -57,7 +57,8 @@ else:
 
     class CubeCanvas(wxGLCanvas):
         def __init__(self, parent):
 
     class CubeCanvas(wxGLCanvas):
         def __init__(self, parent):

-            wxGLCanvas.__init__(self, parent, -1)
+            wxGLCanvas.__init__(self, parent, -1) #,
+                                #attribList=[GL_RED_BITS, 4, GL_DOUBLEBUFFER] )

             EVT_ERASE_BACKGROUND(self, self.OnEraseBackground)
             EVT_SIZE(self, self.OnSize)
             EVT_PAINT(self, self.OnPaint)
             EVT_ERASE_BACKGROUND(self, self.OnEraseBackground)
             EVT_SIZE(self, self.OnSize)
             EVT_PAINT(self, self.OnPaint)


@@ -232,7 +233,7 @@ overview = """\
 def _test():
     class MyApp(wxApp):
         def OnInit(self):
 def _test():
     class MyApp(wxApp):
         def OnInit(self):

-            frame = wxFrame(NULL, -1, "GL Demos", wxDefaultPosition, wxSize(600,300))
+            frame = wxFrame(None, -1, "GL Demos", wxDefaultPosition, wxSize(600,300))

             #win = ConeCanvas(frame)
             MySplitter(frame)
             frame.Show(TRUE)
             #win = ConeCanvas(frame)
             MySplitter(frame)
             frame.Show(TRUE)