always return a non NULL font from wxLoadFont

[wxWidgets.git] / wxPython / demo / Main.py

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index f78f494f19bb46c4f55237fe9f0ecafe03ed675e..1ba205d7b58902f75f276b9701ebcfdaef763fa4 100644 (file)
--- 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__':