X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/78862f240c167007c922e5fc6105e4d9522f332f..cefae4bc3cac29222757afbd605867b34f421af9:/wxPython/demo/Main.py diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py index 52f30c3176..b500a003a4 100644 --- a/wxPython/demo/Main.py +++ b/wxPython/demo/Main.py @@ -461,7 +461,7 @@ class wxPythonDemo(wx.Frame): self.CreateStatusBar(1, wx.ST_SIZEGRIP) splitter = wx.SplitterWindow(self, -1) - splitter2 = wx.SplitterWindow(splitter, -1) + splitter2 = wx.SplitterWindow(splitter, -1) ##, size=(20,20)) # Set up a log on the View Log Notebook page self.log = wx.TextCtrl(splitter2, -1, @@ -489,10 +489,9 @@ class wxPythonDemo(wx.Frame): # Make a File menu self.mainmenu = wx.MenuBar() menu = wx.Menu() - exitID = wx.NewId() - menu.Append(exitID, 'E&xit\tAlt-X', 'Get the heck outta here!') - self.Bind(wx.EVT_MENU, self.OnFileExit, id=exitID) - wx.App_SetMacExitMenuItemId(exitID) + item = menu.Append(-1, 'E&xit\tAlt-X', 'Get the heck outta here!') + self.Bind(wx.EVT_MENU, self.OnFileExit, item) + wx.App_SetMacExitMenuItemId(item.GetId()) self.mainmenu.Append(menu, '&File') # Make a Demo menu @@ -500,9 +499,8 @@ class wxPythonDemo(wx.Frame): for item in _treeList: submenu = wx.Menu() for childItem in item[1]: - mID = wx.NewId() - submenu.Append(mID, childItem) - self.Bind(wx.EVT_MENU, self.OnDemoMenu, id=mID) + mi = submenu.Append(-1, childItem) + self.Bind(wx.EVT_MENU, self.OnDemoMenu, mi) menu.AppendMenu(wx.NewId(), item[0], submenu) self.mainmenu.Append(menu, '&Demo') @@ -512,14 +510,14 @@ class wxPythonDemo(wx.Frame): findID = wx.NewId() findnextID = wx.NewId() menu = wx.Menu() - menu.Append(findID, '&Find\tCtrl-F', 'Find in the Demo Code') - menu.Append(findnextID, 'Find &Next\tF3', 'Find Next') + findItem = menu.Append(-1, '&Find\tCtrl-F', 'Find in the Demo Code') + findnextItem = menu.Append(-1, 'Find &Next\tF3', 'Find Next') menu.AppendSeparator() - menu.Append(helpID, '&About\tCtrl-H', 'wxPython RULES!!!') - wx.App_SetMacAboutMenuItemId(helpID) - self.Bind(wx.EVT_MENU, self.OnHelpAbout, id=helpID) - self.Bind(wx.EVT_MENU, self.OnHelpFind, id=findID) - self.Bind(wx.EVT_MENU, self.OnFindNext, id=findnextID) + helpItem = menu.Append(-1, '&About\tCtrl-H', 'wxPython RULES!!!') + wx.App_SetMacAboutMenuItemId(helpItem.GetId()) + self.Bind(wx.EVT_MENU, self.OnHelpAbout, helpItem) + self.Bind(wx.EVT_MENU, self.OnHelpFind, findItem) + self.Bind(wx.EVT_MENU, self.OnFindNext, findnextItem) self.Bind(wx.EVT_COMMAND_FIND, self.OnFind) self.Bind(wx.EVT_COMMAND_FIND_NEXT, self.OnFind) self.Bind(wx.EVT_COMMAND_FIND_CLOSE, self.OnFindClose) @@ -602,7 +600,7 @@ class wxPythonDemo(wx.Frame): splitter2.SetMinimumPaneSize(20) - # Make the splitter on the right expand the top wind when resized + # Make the splitter on the right expand the top window when resized def SplitterOnSize(evt): splitter = evt.GetEventObject() sz = splitter.GetSize() @@ -685,7 +683,7 @@ class wxPythonDemo(wx.Frame): if itemText == self.overviewText: self.LoadDemoSource('Main.py') self.SetOverview(self.overviewText, overview) - self.nb.Refresh(); +## self.nb.Refresh(); self.window = None else: @@ -705,14 +703,14 @@ class wxPythonDemo(wx.Frame): self.tree.Refresh() # in case runTest is modal, make sure things look right... - self.nb.Refresh(); - wx.SafeYield() +## self.nb.Refresh(); +## wx.SafeYield() self.window = module.runTest(self, self.nb, self) ### if self.window is not None: self.nb.AddPage(self.window, 'Demo') self.nb.SetSelection(2) - self.nb.Refresh() # without this wxMac has troubles showing the just added page +## self.nb.Refresh() # without this wxMac has troubles showing the just added page else: self.ovr.SetPage("") @@ -897,6 +895,7 @@ class MySplashScreen(wx.SplashScreen): self.Bind(wx.EVT_CLOSE, self.OnClose) def OnClose(self, evt): + self.Hide() frame = wxPythonDemo(None, -1, "wxPython: (A Demonstration)") frame.Show() evt.Skip() # Make sure the default handler runs too... @@ -932,7 +931,7 @@ def main(): os.chdir(demoPath) except: pass - app = MyApp(0) #wx.Platform == "__WXMAC__") + app = MyApp(0) ##wx.Platform == "__WXMAC__") app.MainLoop()