From: Robin Dunn <robin@alldunn.com>
Date: Wed, 2 Feb 2005 22:35:27 +0000 (+0000)
Subject: All the demo samples return a panel now, no need to cater for frames
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8fc680f47c9607873d7a3d67ed1bf82e4713a08f

All the demo samples return a panel now, no need to cater for frames
or dialogs.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/wxPython/demo/run.py b/wxPython/demo/run.py
index f4bb659daa..f27591bc71 100755
--- a/wxPython/demo/run.py
+++ b/wxPython/demo/run.py
@@ -59,7 +59,7 @@ class RunDemoApp(wx.App):
         menuBar = wx.MenuBar()
         menu = wx.Menu()
         item = menu.Append(-1, "E&xit\tAlt-X", "Exit demo")
-        self.Bind(wx.EVT_MENU, self.OnButton, item)
+        self.Bind(wx.EVT_MENU, self.OnExit, item)
         menuBar.Append(menu, "&File")
 
         ns = {}
@@ -85,20 +85,10 @@ class RunDemoApp(wx.App):
             frect = frame.GetRect()
 
         else:
-            # otherwise the demo made its own frame, so just put a
-            # button in this one
-            if hasattr(frame, 'otherWin'):
-                ns['win'] = frame.otherWin
-                frect = frame.otherWin.GetRect()
-                p = wx.Panel(frame, -1)
-                b = wx.Button(p, -1, " Exit ", (10,10))
-                wx.CallAfter(frame.SetClientSize, (200, 100))
-                frame.Bind(wx.EVT_BUTTON, self.OnButton, b)
-            else:
-                # It was probably a dialog or something that is already
-                # gone, so we're done.
-                frame.Destroy()
-                return True
+            # It was probably a dialog or something that is already
+            # gone, so we're done.
+            frame.Destroy()
+            return True
 
         self.SetTopWindow(frame)
         self.frame = frame
@@ -125,7 +115,7 @@ class RunDemoApp(wx.App):
         return True
 
 
-    def OnButton(self, evt):
+    def OnExit(self, evt):
         self.frame.Close(True)