X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/96bfd05319f9e393843e84ca5274d85ff248bad4..f91de7da185ddfa82ece11ab3c0533be7362696b:/wxPython/demo/Main.py diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py index f78f494f19..1ba205d7b5 100644 --- a/wxPython/demo/Main.py +++ b/wxPython/demo/Main.py @@ -22,7 +22,9 @@ import images _treeList = [ - ('New since last release', ['ColourSelect', 'ImageBrowser', + ('New since last release', ['ColourSelect', 'ImageBrowser', 'infoframe', + 'ColourDB', 'wxToggleButton', 'OOR', 'wxWave', + 'wxJoystick', ]), ('Managed Windows', ['wxFrame', 'wxDialog', 'wxMiniFrame']), @@ -42,7 +44,7 @@ _treeList = [ 'wxComboBox', 'wxGauge', 'wxListBox', 'wxListCtrl', 'wxTextCtrl', 'wxTreeCtrl', 'wxSpinButton', 'wxSpinCtrl', 'wxStaticText', 'wxStaticBitmap', 'wxRadioBox', 'wxSlider', 'wxToolBar', - 'wxCalendarCtrl', + 'wxCalendarCtrl', 'wxToggleButton', ]), ('Window Layout', ['wxLayoutConstraints', 'LayoutAnchors', 'Sizers', ]), @@ -52,7 +54,8 @@ _treeList = [ 'wxImage', 'wxMask', 'PrintFramework', 'wxOGL', 'PythonEvents', 'Threads', 'ActiveXWrapper_Acrobat', 'ActiveXWrapper_IE', - 'wxDragImage', "wxProcess", "FancyText", + 'wxDragImage', "wxProcess", "FancyText", "OOR", "wxWave", + 'wxJoystick', ]), ('wxPython Library', ['Layoutf', 'wxScrolledMessageDialog', @@ -77,7 +80,14 @@ class wxPythonDemo(wxFrame): self.cwd = os.getcwd() self.curOverview = "" - icon = wxIconFromXPMData(images.getMondrianData()) + if 1: + icon = wxIconFromXPMData(images.getMondrianData()) + else: + # another way to do it + bmp = images.getMondrianBitmap() + icon = wxEmptyIcon() + icon.CopyFromBitmap(bmp) + self.SetIcon(icon) if wxPlatform == '__WXMSW__':