German translations update from Martin Jost (patch 782996)

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

diff --git a/wxPython/demo/wxGLCanvas.py b/wxPython/demo/wxGLCanvas.py
index 015504053b8f329a05d92c20eaf9c4111d6758cf..a4d0194cb07a2df15015fcfe04ea1685787ad9d4 100644 (file)
--- a/wxPython/demo/wxGLCanvas.py
+++ b/wxPython/demo/wxGLCanvas.py
@@ -1,18 +1,18 @@
 from wxPython.wx       import *
 try:
     from wxPython.glcanvas import *
 from wxPython.wx       import *
 try:
     from wxPython.glcanvas import *

-    haveGLCanvas = true
+    haveGLCanvas = True

 except ImportError:
 except ImportError:

-    haveGLCanvas = false
+    haveGLCanvas = False

 
 try:
     # The Python OpenGL package can be found at
     # http://PyOpenGL.sourceforge.net/
     from OpenGL.GL import *
     from OpenGL.GLUT import *
 
 try:
     # The Python OpenGL package can be found at
     # http://PyOpenGL.sourceforge.net/
     from OpenGL.GL import *
     from OpenGL.GLUT import *

-    haveOpenGL = true
+    haveOpenGL = True

 except ImportError:
 except ImportError:

-    haveOpenGL = false
+    haveOpenGL = False

 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------
 


@@ -56,15 +56,22 @@ else:
                 box.Add(btn, 0, wxALIGN_CENTER|wxALL, 15)
                 EVT_BUTTON(self, k, self.OnButton)
 
                 box.Add(btn, 0, wxALIGN_CENTER|wxALL, 15)
                 EVT_BUTTON(self, k, self.OnButton)
 

-            self.SetAutoLayout(true)
+            #** Enable this to show putting a wxGLCanvas on the wxPanel
+            if 0:
+                c = CubeCanvas(self)
+                c.SetSize((200, 200))
+                box.Add(c, 0, wxALIGN_CENTER|wxALL, 15)
+
+            self.SetAutoLayout(True)

             self.SetSizer(box)
 
             self.SetSizer(box)
 

+

         def OnButton(self, evt):
             canvasClassName = buttonDefs[evt.GetId()][0]
             canvasClass = eval(canvasClassName)
             frame = wxFrame(None, -1, canvasClassName, size=(400,400))
             canvas = canvasClass(frame)
         def OnButton(self, evt):
             canvasClassName = buttonDefs[evt.GetId()][0]
             canvasClass = eval(canvasClassName)
             frame = wxFrame(None, -1, canvasClassName, size=(400,400))
             canvas = canvasClass(frame)

-            frame.Show(true)
+            frame.Show(True)

 
 
 
 
 
 


@@ -78,7 +85,7 @@ else:
     class MyCanvasBase(wxGLCanvas):
         def __init__(self, parent):
             wxGLCanvas.__init__(self, parent, -1)
     class MyCanvasBase(wxGLCanvas):
         def __init__(self, parent):
             wxGLCanvas.__init__(self, parent, -1)

-            self.init = false
+            self.init = False

             # initial mouse position
             self.lastx = self.x = 30
             self.lasty = self.y = 30
             # initial mouse position
             self.lastx = self.x = 30
             self.lasty = self.y = 30


@@ -103,7 +110,7 @@ else:
             self.SetCurrent()
             if not self.init:
                 self.InitGL()
             self.SetCurrent()
             if not self.init:
                 self.InitGL()

-                self.init = true
+                self.init = True

             self.OnDraw()
 
         def OnMouseDown(self, evt):
             self.OnDraw()
 
         def OnMouseDown(self, evt):


@@ -116,7 +123,7 @@ else:
             if evt.Dragging() and evt.LeftIsDown():
                 self.x, self.y = self.lastx, self.lasty
                 self.x, self.y = evt.GetPosition()
             if evt.Dragging() and evt.LeftIsDown():
                 self.x, self.y = self.lastx, self.lasty
                 self.x, self.y = evt.GetPosition()

-                self.Refresh(false)
+                self.Refresh(False)

 
 
 
 
 
 


@@ -261,9 +268,9 @@ def _test():
             frame = wxFrame(None, -1, "GL Demos", wxDefaultPosition, wxSize(600,300))
             #win = ConeCanvas(frame)
             MySplitter(frame)
             frame = wxFrame(None, -1, "GL Demos", wxDefaultPosition, wxSize(600,300))
             #win = ConeCanvas(frame)
             MySplitter(frame)

-            frame.Show(TRUE)
+            frame.Show(True)

             self.SetTopWindow(frame)
             self.SetTopWindow(frame)

-            return TRUE
+            return True

 
     app = MyApp(0)
     app.MainLoop()
 
     app = MyApp(0)
     app.MainLoop()