X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f3d9dc1d8798f445a5f74db680808afdab2b11be..06b781c7c630ff8c2ab30211cb4351b4cb5bfb47:/wxPython/demo/wxOGL.py

diff --git a/wxPython/demo/wxOGL.py b/wxPython/demo/wxOGL.py
index 934152255a..a13bee893a 100644
--- a/wxPython/demo/wxOGL.py
+++ b/wxPython/demo/wxOGL.py
@@ -2,6 +2,8 @@
 from wxPython.wx import *
 from wxPython.ogl import *
 
+import images
+
 #----------------------------------------------------------------------
 # This creates some pens and brushes that the OGL library uses.
 
@@ -41,40 +43,6 @@ class RoundedRectangleShape(wxRectangleShape):
         self.SetCornerRadius(-0.3)
 
 
-#----------------------------------------------------------------------
-
-## class LabeledBitmapShape(wxBitmapShape):
-##     def __init__(self, bmp, text):
-##         wxBitmapShape.__init__(self)
-##         self.SetBitmap(bmp)
-##         self.region = r = wxShapeRegion()
-##         r.SetPosition(0, 0) #bmp.GetHeight())
-##         r.SetSize(bmp.GetWidth(), bmp.GetHeight())
-##         r.SetText(text)
-##         self.AddRegion(r)
-
-##     def OnMovePost(self, dc, x, y, old_x, old_y, display):
-##         self.region.SetPosition(x, y)
-##         self.base_OnMovePost(dc, x, y, old_x, old_y, display)
-
-
-## class LabeledBitmapShape(wxCompositeShape):
-##     def __init__(self, canvas, bmp, text):
-##         wxCompositeShape.__init__(self)
-##         self.bs = wxBitmapShape()
-##         self.bs.SetBitmap(bmp)
-##         self.ts = wxTextShape()
-##         self.ts.AddText(text)
-
-##         self.AddChild(self.bs)
-##         self.AddChild(self.ts, self.bs)
-
-##         self.AddConstrainedShapes(gyCONSTRAINT_CENTRED_VERTICALLY, self, [self.bs, self.ts])
-##         self.AddSimpleConstraint(gyCONSTRAINT_BELOW, self.bs, self.ts)
-##         self.AddSimpleConstraint(gyCONSTRAINT_ALIGNED_TOP, self, self.bs)
-##         self.AddSimpleConstraint(gyCONSTRAINT_ALIGNED_BOTTOM, self, self.ts)
-
-
 #----------------------------------------------------------------------
 
 class MyEvtHandler(wxShapeEvtHandler):
@@ -168,19 +136,9 @@ class TestWindow(wxShapeCanvas):
         self.MyAddShape(DiamondShape(90, 90), 345, 235, wxPen(wxBLUE, 3, wxDOT), wxRED_BRUSH, "Polygon")
         self.MyAddShape(RoundedRectangleShape(95,70), 140, 255, wxPen(wxRED, 1), rRectBrush, "Rounded Rect")
 
-        bmp = wxBitmap('bitmaps/test2.bmp', wxBITMAP_TYPE_BMP)
+        bmp = images.getTest2Bitmap()
         mask = wxMaskColour(bmp, wxBLUE)
         bmp.SetMask(mask)
-##         s = LabeledBitmapShape(self, bmp, "Hello")
-##         self.MyAddShape(s, 225, 150, None, None, None)
-##         print s.Recompute()
-##         s.CalculateSize()
-##         print s.GetX(), s.GetY()
-##         s.SetSize(225)
-##         s.SetY(150)
-##         s.SetSize(80, 80)
-##         print s.GetX(), s.GetY()
-##         #print s.GetSize()
 
         s = wxBitmapShape()
         s.SetBitmap(bmp)
@@ -235,6 +193,7 @@ class TestWindow(wxShapeCanvas):
             if shape.GetParent() == None:
                 shape.SetCanvas(None)
                 shape.Destroy()
+        self.diagram.Destroy()
 
 
 #----------------------------------------------------------------------