X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f3d9dc1d8798f445a5f74db680808afdab2b11be..adebd2d72c8897f30bd9e673d1e16ef2794d72ab:/wxPython/demo/Main.py diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py index bc8bb4fde3..8f8297e773 100644 --- a/wxPython/demo/Main.py +++ b/wxPython/demo/Main.py @@ -16,11 +16,14 @@ from wxPython.wx import * from wxPython.lib.splashscreen import SplashScreen from wxPython.html import wxHtmlWindow +import images + #--------------------------------------------------------------------------- _treeList = [ - ('New since last release', ['LayoutAnchors', "FancyText", + ('New since last release', ['ColourSelect', 'ImageBrowser', 'infoframe', + 'ColourDB', ]), ('Managed Windows', ['wxFrame', 'wxDialog', 'wxMiniFrame']), @@ -57,7 +60,7 @@ _treeList = [ 'wxMultipleChoiceDialog', 'wxPlotCanvas', 'wxFloatBar', 'PyShell', 'wxCalendar', 'wxMVCTree', 'wxVTKRenderWindow', 'FileBrowseButton', 'GenericButtons', 'wxEditor', - 'PyShellWindow', + 'PyShellWindow', 'ColourSelect', 'ImageBrowser', ]), ('Cool Contribs', ['pyTree', 'hangman', 'SlashDot', 'XMLtreeview']), @@ -75,10 +78,10 @@ class wxPythonDemo(wxFrame): self.cwd = os.getcwd() self.curOverview = "" - if wxPlatform == '__WXMSW__': - icon = wxIcon('bitmaps/mondrian.ico', wxBITMAP_TYPE_ICO) - self.SetIcon(icon) + icon = wxIconFromXPMData(images.getMondrianData()) + self.SetIcon(icon) + if wxPlatform == '__WXMSW__': # setup a taskbar icon, and catch some events from it self.tbicon = wxTaskBarIcon() self.tbicon.SetIcon(icon, "wxPython Demo")