X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c5ae2d2a6f716e8a89b27579026b9d085f84191..3f4f90c2a0c1f274d1918b320132ed0ca2922fe5:/wxPython/demo/Main.py?ds=sidebyside diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py index 8e630857ef..a741bc01ff 100644 --- a/wxPython/demo/Main.py +++ b/wxPython/demo/Main.py @@ -13,7 +13,6 @@ import sys, os, time, string from wxPython.wx import * -from wxPython.lib.splashscreen import SplashScreen from wxPython.html import wxHtmlWindow import images @@ -23,6 +22,10 @@ import images _treeList = [ ('New since last release', ['wxGenericDirCtrl', + 'wxImageFromStream', + 'RowColSizer', + 'Unicode', + 'wxFileHistory', ]), ('Windows', ['wxFrame', 'wxDialog', 'wxMiniFrame', @@ -50,7 +53,9 @@ _treeList = [ 'wxEditableListBox', 'wxLEDNumberCtrl', ]), - ('Window Layout', ['wxLayoutConstraints', 'LayoutAnchors', 'Sizers', 'XML_Resource']), + ('Window Layout', ['wxLayoutConstraints', 'LayoutAnchors', 'Sizers', 'XML_Resource', + 'RowColSizer', + ]), ('Miscellaneous', [ 'DragAndDrop', 'CustomDragAndDrop', 'URLDragAndDrop', 'FontEnumerator', @@ -60,7 +65,7 @@ _treeList = [ 'ActiveXWrapper_Acrobat', 'ActiveXWrapper_IE', 'wxDragImage', "wxProcess", "FancyText", "OOR", "wxWave", 'wxJoystick', 'DrawXXXList', 'ErrorDialogs', 'wxMimeTypesManager', - 'ContextHelp', 'SplitTree', + 'ContextHelp', 'SplitTree', 'Unicode', 'wxFileHistory', ]), ('wxPython Library', ['Layoutf', 'wxScrolledMessageDialog', @@ -105,6 +110,7 @@ def opj(path): #--------------------------------------------------------------------------- class wxPythonDemo(wxFrame): + overviewText = "wxPython Overview" def __init__(self, parent, id, title): wxFrame.__init__(self, parent, -1, title, size = (800, 600), @@ -113,14 +119,7 @@ class wxPythonDemo(wxFrame): self.cwd = os.getcwd() self.curOverview = "" - if 1: - icon = wxIconFromXPMData(images.getMondrianData()) - else: - # another way to do it - bmp = images.getMondrianBitmap() - icon = wxEmptyIcon() - icon.CopyFromBitmap(bmp) - + icon = images.getMondrianIcon() self.SetIcon(icon) if wxPlatform == '__WXMSW__': @@ -134,6 +133,7 @@ class wxPythonDemo(wxFrame): self.otherWin = None + self.showTip = true EVT_IDLE(self, self.OnIdle) EVT_CLOSE(self, self.OnCloseWindow) EVT_ICONIZE(self, self.OnIconfiy) @@ -192,10 +192,10 @@ class wxPythonDemo(wxFrame): self.tree = wxTreeCtrl(splitter, tID, style=wxTR_HAS_BUTTONS | wxTR_EDIT_LABELS | - wxTR_HAS_VARIABLE_ROW_HEIGHT | - wxSUNKEN_BORDER) + wxTR_HAS_VARIABLE_ROW_HEIGHT) + #self.tree.SetBackgroundColour(wxNamedColour("Pink")) - root = self.tree.AddRoot("Overview") + root = self.tree.AddRoot("wxPython Overview") firstChild = None for item in _treeList: child = self.tree.AppendItem(root, item[0]) @@ -220,12 +220,12 @@ class wxPythonDemo(wxFrame): # the notebook... if 0: # the old way self.ovr = wxHtmlWindow(self.nb, -1, size=(400, 400)) - self.nb.AddPage(self.ovr, "Overview") + self.nb.AddPage(self.ovr, self.overviewText) else: # hopefully I can remove this hacky code soon, see bug #216861 panel = wxPanel(self.nb, -1, style=wxCLIP_CHILDREN) self.ovr = wxHtmlWindow(panel, -1, size=(400, 400)) - self.nb.AddPage(panel, "Overview") + self.nb.AddPage(panel, self.overviewText) def OnOvrSize(evt, ovr=self.ovr): ovr.SetSize(evt.GetSize()) @@ -234,7 +234,7 @@ class wxPythonDemo(wxFrame): EVT_ERASE_BACKGROUND(panel, EmptyHandler) - self.SetOverview("Overview", overview) + self.SetOverview(self.overviewText, overview) # Set up a TextCtrl on the Demo Code Notebook page @@ -246,8 +246,11 @@ class wxPythonDemo(wxFrame): # Set up a log on the View Log Notebook page self.log = wxTextCtrl(splitter2, -1, style = wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL) + # Set the wxWindows log target to be this textctrl #wxLog_SetActiveTarget(wxLogTextCtrl(self.log)) + + # But instead of the above we want to show how to use our own wxLog class wxLog_SetActiveTarget(MyLog(self.log)) @@ -256,12 +259,13 @@ class wxPythonDemo(wxFrame): # add the windows to the splitter and split it. splitter2.SplitHorizontally(self.nb, self.log) - splitter2.SetSashPosition(450, true) - splitter2.SetMinimumPaneSize(20) - splitter.SplitVertically(self.tree, splitter2) + splitter.SetSashPosition(180, true) splitter.SetMinimumPaneSize(20) + splitter2.SetSashPosition(450, true) + splitter2.SetMinimumPaneSize(20) + # select initial items @@ -329,9 +333,9 @@ class wxPythonDemo(wxFrame): self.nb.SetSelection(0) self.nb.DeletePage(2) - if itemText == 'Overview': + if itemText == self.overviewText: self.GetDemoFile('Main.py') - self.SetOverview('Overview', overview) + self.SetOverview(self.overviewText, overview) self.nb.Refresh(); self.window = None @@ -342,7 +346,7 @@ class wxPythonDemo(wxFrame): try: self.GetDemoFile(itemText + '.py') module = __import__(itemText, globals()) - self.SetOverview(itemText, module.overview) + self.SetOverview(itemText + " Overview", module.overview) finally: wxEndBusyCursor() @@ -414,6 +418,25 @@ class wxPythonDemo(wxFrame): self.window = self.otherWin self.otherWin = None + if self.showTip: + self.ShowTip() + self.showTip = false + + + #--------------------------------------------- + def ShowTip(self): + try: + showTipText = open(opj("data/showTips")).read() + showTip, index = eval(showTipText) + except IOError: + showTip, index = (1, 0) + if showTip: + tp = wxCreateFileTipProvider(opj("data/tips.txt"), index) + showTip = wxShowTip(self, tp) + index = tp.GetCurrentTip() + open(opj("data/showTips"), "w").write(str( (showTip, index) )) + + #--------------------------------------------- def OnDemoMenu(self, event): try: @@ -481,21 +504,7 @@ class MySplashScreen(wxSplashScreen): def OnClose(self, evt): frame = wxPythonDemo(None, -1, "wxPython: (A Demonstration)") frame.Show(true) - self.ShowTip(frame) - evt.Skip() - - def ShowTip(self, frame): - try: - showTipText = open(opj("data/showTips")).read() - showTip, index = eval(showTipText) - except IOError: - showTip, index = (1, 0) - if showTip: - tp = wxCreateFileTipProvider(opj("data/tips.txt"), index) - showTip = wxShowTip(frame, tp) - index = tp.GetCurrentTip() - open(opj("data/showTips"), "w").write(str( (showTip, index) )) - + evt.Skip() # Make sure the default handler runs too... class MyApp(wxApp): @@ -507,7 +516,6 @@ class MyApp(wxApp): wxInitAllImageHandlers() splash = MySplashScreen() splash.Show() - wxYield() return true