X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f44602beb7f548ce44237cdb417b7a994b54b901..94bc8b14d4f74c5bb831b0eca20a45c751fbb5fe:/wxPython/demo/Main.py diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py index 4cc8d92819..82736b72fe 100644 --- a/wxPython/demo/Main.py +++ b/wxPython/demo/Main.py @@ -15,6 +15,8 @@ import sys, os, time, string from wxPython.wx import * from wxPython.html import wxHtmlWindow +##from wxPython.stc import * + import images #--------------------------------------------------------------------------- @@ -28,6 +30,13 @@ _treeList = [ 'wxFileHistory', 'wxGenericDirCtrl', 'wxImageFromStream', + 'wxArtProvider', + 'ScrolledPanel', + 'wxMenu', + 'wxIEHtmlWin', + 'wxKeyEvents', + 'wxWizard', + 'wxXmlResourceHandler', ]), # managed windows == things with a caption you can close @@ -36,6 +45,7 @@ _treeList = [ 'wxFrame', 'wxMDIWindows', 'wxMiniFrame', + 'wxWizard', ]), # the common dialogs @@ -53,7 +63,7 @@ _treeList = [ 'wxTextEntryDialog', ]), - # dialogs form libraries + # dialogs from libraries ('More Dialogs', [ 'ErrorDialogs', 'ImageBrowser', @@ -63,7 +73,6 @@ _treeList = [ # core controls ('Core Windows/Controls', [ - 'VirtualListCtrl', 'wxButton', 'wxCheckBox', 'wxCheckListBox', @@ -74,6 +83,8 @@ _treeList = [ 'wxGrid', 'wxListBox', 'wxListCtrl', + 'wxListCtrl_virtual', + 'wxMenu', 'wxNotebook', 'wxPopupWindow', 'wxRadioBox', @@ -109,14 +120,15 @@ _treeList = [ 'wxDynamicSashWindow', 'wxEditableListBox', 'wxEditor', - 'wxFloatBar', + #'wxFloatBar', deprecated 'wxHtmlWindow', + 'wxIEHtmlWin', 'wxLEDNumberCtrl', 'wxMimeTypesManager', - 'wxMVCTree', + #'wxMVCTree', deprecated + 'wxRightTextCtrl', 'wxStyledTextCtrl_1', 'wxStyledTextCtrl_2', - 'wxRightTextCtrl', ]), # How to lay out the controls in a frame/dialog @@ -124,9 +136,11 @@ _treeList = [ 'LayoutAnchors', 'Layoutf', 'RowColSizer', + 'ScrolledPanel', 'Sizers', 'wxLayoutConstraints', - 'XML_Resource', + 'wxXmlResource', + 'wxXmlResourceHandler', ]), # ditto @@ -137,6 +151,7 @@ _treeList = [ 'Threads', 'wxProcess', 'wxTimer', + 'wxKeyEvents', ]), # Clipboard and DnD @@ -152,6 +167,7 @@ _treeList = [ 'wxImage', 'wxImageFromStream', 'wxMask', + 'wxArtProvider', ]), # Other stuff @@ -176,7 +192,7 @@ _treeList = [ 'wxPlotCanvas', ]), - # pyTree, hangman, ... in the samples dir + ('Check out the samples dir too', [ ]), @@ -199,6 +215,10 @@ class MyLog(wxPyLog): self.tc.AppendText(message + '\n') +class MyTP(wxPyTipProvider): + def GetTip(self): + return "This is my tip" + #--------------------------------------------------------------------------- def opj(path): @@ -290,8 +310,8 @@ class wxPythonDemo(wxFrame): self.treeMap = {} self.tree = wxTreeCtrl(splitter, tID, style=wxTR_HAS_BUTTONS | - wxTR_EDIT_LABELS | - wxTR_HAS_VARIABLE_ROW_HEIGHT) + wxTR_HAS_VARIABLE_ROW_HEIGHT + ) #self.tree.SetBackgroundColour(wxNamedColour("Pink")) root = self.tree.AddRoot("wxPython Overview") @@ -352,10 +372,13 @@ class wxPythonDemo(wxFrame): # But instead of the above we want to show how to use our own wxLog class wxLog_SetActiveTarget(MyLog(self.log)) - + # for serious debugging + #wxLog_SetActiveTarget(wxLogStderr()) + #wxLog_SetTraceMask(wxTraceMessages) self.Show(true) + # add the windows to the splitter and split it. splitter2.SplitHorizontally(self.nb, self.log) splitter.SplitVertically(self.tree, splitter2) @@ -448,15 +471,15 @@ class wxPythonDemo(wxFrame): self.SetOverview(itemText + " Overview", module.overview) finally: wxEndBusyCursor() + self.tree.Refresh() # in case runTest is modal, make sure things look right... self.nb.Refresh(); - wxYield() + wxSafeYield() self.window = module.runTest(self, self.nb, self) ### if self.window: self.nb.AddPage(self.window, 'Demo') - #wxYield() TODO: Is this still needed? self.nb.SetSelection(2) self.nb.Refresh() # without this wxMac has troubles showing the just added page @@ -532,6 +555,7 @@ class wxPythonDemo(wxFrame): showTip, index = (1, 0) if showTip: tp = wxCreateFileTipProvider(opj("data/tips.txt"), index) + ##tp = MyTP(0) showTip = wxShowTip(self, tp) index = tp.GetCurrentTip() open(opj("data/showTips"), "w").write(str( (showTip, index) )) @@ -598,7 +622,8 @@ class MySplashScreen(wxSplashScreen): bmp = wxImage(opj("bitmaps/splash.gif")).ConvertToBitmap() wxSplashScreen.__init__(self, bmp, wxSPLASH_CENTRE_ON_SCREEN|wxSPLASH_TIMEOUT, - 4000, None, -1) + 4000, None, -1, + style = wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP) EVT_CLOSE(self, self.OnClose) def OnClose(self, evt): @@ -628,7 +653,7 @@ def main(): os.chdir(demoPath) except: pass - app = MyApp(0) + app = MyApp(wxPlatform == "__WXMAC__") app.MainLoop()