update from herbert breunung

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

diff --git a/wxPython/demo/OGL.py b/wxPython/demo/OGL.py
index cb9b11e8ffdad960361ebb242fc99e1d7dbb4559..0fad4004923a355cc898f378fa23663e0986e6c4 100644 (file)
--- a/wxPython/demo/OGL.py
+++ b/wxPython/demo/OGL.py
@@ -257,12 +257,12 @@ class TestWindow(ogl.ShapeCanvas):
         
         self.MyAddShape(
             ogl.CircleShape(80), 
-            100, 100, wx.Pen(wx.BLUE, 3), wx.GREEN_BRUSH, "Circle"
+            75, 110, wx.Pen(wx.BLUE, 3), wx.GREEN_BRUSH, "Circle"
             )
             
         self.MyAddShape(
-            ogl.TextShape(45, 30), 
-            205, 60, wx.GREEN_PEN, wx.LIGHT_GREY_BRUSH, "Text"
+            ogl.TextShape(120, 45), 
+            160, 35, wx.GREEN_PEN, wx.LIGHT_GREY_BRUSH, "OGL is now a\npure Python lib!"
             )
 
         self.MyAddShape(
@@ -327,7 +327,9 @@ class TestWindow(ogl.ShapeCanvas):
         shape.SetY(y)
         if pen:    shape.SetPen(pen)
         if brush:  shape.SetBrush(brush)
-        if text:   shape.AddText(text)
+        if text:
+            for line in text.split('\n'):
+                shape.AddText(line)
         #shape.SetShadowMode(ogl.SHADOW_RIGHT)
         self.diagram.AddShape(shape)
         shape.Show(True)