X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8fa876ca9ec87e90605808bfcab4d4226965dbad..27758ba7d4465a9edac4cf3f9ee0fa6c57f304f4:/wxPython/demo/ShapedWindow.py

diff --git a/wxPython/demo/ShapedWindow.py b/wxPython/demo/ShapedWindow.py
index 586f6b09ab..26361a7d12 100644
--- a/wxPython/demo/ShapedWindow.py
+++ b/wxPython/demo/ShapedWindow.py
@@ -1,7 +1,3 @@
-# 11/13/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-#
-# o Updated for wx namespace
-#
 
 import  wx
 import  images
@@ -48,7 +44,7 @@ class TestFrame(wx.Frame):
             self.SetWindowShape()
 
         dc = wx.ClientDC(self)
-        dc.DrawBitmap(self.bmp, (0,0), True)
+        dc.DrawBitmap(self.bmp, 0,0, True)
 
 
     def SetWindowShape(self, *evt):
@@ -67,7 +63,7 @@ class TestFrame(wx.Frame):
 
     def OnPaint(self, evt):
         dc = wx.PaintDC(self)
-        dc.DrawBitmap(self.bmp, (0,0), True)
+        dc.DrawBitmap(self.bmp, 0,0, True)
 
     def OnExit(self, evt):
         self.Close()
@@ -94,14 +90,28 @@ class TestFrame(wx.Frame):
             self.Move(fp)
 
 
-#----------------------------------------------------------------------
+#---------------------------------------------------------------------------
 
-def runTest(frame, nb, log):
-    win = TestFrame(nb, log)
-    frame.otherWin = win
-    win.Show(True)
+class TestPanel(wx.Panel):
+    def __init__(self, parent, log):
+        self.log = log
+        wx.Panel.__init__(self, parent, -1)
+
+        b = wx.Button(self, -1, "Show the ShapedWindow sample", (50,50))
+        self.Bind(wx.EVT_BUTTON, self.OnButton, b)
 
 
+    def OnButton(self, evt):
+        win = TestFrame(self, self.log)
+        win.Show(True)
+
+#---------------------------------------------------------------------------
+
+
+def runTest(frame, nb, log):
+    win = TestPanel(nb, log)
+    return win
+
 #----------------------------------------------------------------------
 
 
@@ -122,5 +132,5 @@ sensitive to the mouse in those areas either.
 if __name__ == '__main__':
     import sys,os
     import run
-    run.main(['', os.path.basename(sys.argv[0])])
+    run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])