added static wxPlatformInfo::Get() and use it (patch 1549176)

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

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 250c5b908ca7d58ca5bba0475ed2583e068b85cb..c0a19c56b03df6dbc6bd64c58d34d2632e4a312f 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -61,6 +61,11 @@ _treeList = [
         'RawBitmapAccess',
         'DragScroller',
 ##        'AlphaDrawing',
         'RawBitmapAccess',
         'DragScroller',
 ##        'AlphaDrawing',

+        'DelayedResult',
+        'ExpandoTextCtrl',
+        'ButtonPanel',
+        'FlatNotebook',
+        'CustomTreeCtrl',

         ]),
 
     # managed windows == things with a (optional) caption you can close
         ]),
 
     # managed windows == things with a (optional) caption you can close


@@ -144,9 +149,12 @@ _treeList = [
 
     ('Custom Controls', [
         'AnalogClock',
 
     ('Custom Controls', [
         'AnalogClock',

+        'ButtonPanel',

         'ColourSelect',
         'ComboTreeBox',
         'ColourSelect',
         'ComboTreeBox',

+        'CustomTreeCtrl',

         'Editor',
         'Editor',

+        'FlatNotebook',

         'GenericButtons',
         'GenericDirCtrl',
         'LEDNumberCtrl',
         'GenericButtons',
         'GenericDirCtrl',
         'LEDNumberCtrl',


@@ -169,6 +177,7 @@ _treeList = [
         'DatePickerCtrl',
         'DynamicSashWindow',
         'EditableListBox',
         'DatePickerCtrl',
         'DynamicSashWindow',
         'EditableListBox',

+        'ExpandoTextCtrl',

         'FancyText',
         'FileBrowseButton',
         'FloatBar',  
         'FancyText',
         'FileBrowseButton',
         'FloatBar',  


@@ -215,6 +224,7 @@ _treeList = [
 
     # ditto
     ('Process and Events', [
 
     # ditto
     ('Process and Events', [

+        'DelayedResult',

         'EventManager',
         'KeyEvents',
         'Process',
         'EventManager',
         'KeyEvents',
         'Process',


@@ -1143,8 +1153,11 @@ class wxPythonDemo(wx.Frame):
         icon = images.getWXPdemoIcon()
         self.SetIcon(icon)
 
         icon = images.getWXPdemoIcon()
         self.SetIcon(icon)
 

-        self.tbicon = DemoTaskBarIcon(self)
-
+        try:
+            self.tbicon = DemoTaskBarIcon(self)
+        except:
+            self.tbicon = None
+            

         wx.CallAfter(self.ShowTip)
 
         self.otherWin = None
         wx.CallAfter(self.ShowTip)
 
         self.otherWin = None


@@ -1627,7 +1640,8 @@ class wxPythonDemo(wx.Frame):
         self.demoPage = None
         self.codePage = None
         self.mainmenu = None
         self.demoPage = None
         self.codePage = None
         self.mainmenu = None

-        self.tbicon.Destroy()
+        if self.tbicon is not None:
+            self.tbicon.Destroy()

         self.Destroy()
 
 
         self.Destroy()