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
This commit is contained in:
@@ -59,7 +59,7 @@ class RunDemoApp(wx.App):
|
|||||||
menuBar = wx.MenuBar()
|
menuBar = wx.MenuBar()
|
||||||
menu = wx.Menu()
|
menu = wx.Menu()
|
||||||
item = menu.Append(-1, "E&xit\tAlt-X", "Exit demo")
|
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")
|
menuBar.Append(menu, "&File")
|
||||||
|
|
||||||
ns = {}
|
ns = {}
|
||||||
@@ -84,16 +84,6 @@ class RunDemoApp(wx.App):
|
|||||||
ns['win'] = win
|
ns['win'] = win
|
||||||
frect = frame.GetRect()
|
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:
|
else:
|
||||||
# It was probably a dialog or something that is already
|
# It was probably a dialog or something that is already
|
||||||
# gone, so we're done.
|
# gone, so we're done.
|
||||||
@@ -125,7 +115,7 @@ class RunDemoApp(wx.App):
|
|||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
def OnButton(self, evt):
|
def OnExit(self, evt):
|
||||||
self.frame.Close(True)
|
self.frame.Close(True)
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user