X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d1a7e73ece83f076c4c4c3b89ab3470db13c96c8..f9c1b462c7ea8ff8237c475788c180b956d875a5:/wxPython/demo/Main.py

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 250c5b908c..8a8d63c4b9 100644
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -61,6 +61,13 @@ _treeList = [
         'RawBitmapAccess',
         'DragScroller',
 ##        'AlphaDrawing',
+        'DelayedResult',
+        'ExpandoTextCtrl',
+        'ButtonPanel',
+        'FlatNotebook',
+        'CustomTreeCtrl',
+        'AboutBox',
+        'AnimateCtrl',
         ]),
 
     # managed windows == things with a (optional) caption you can close
@@ -75,6 +82,7 @@ _treeList = [
 
     # the common dialogs
     ('Common Dialogs', [
+        'AboutBox',
         'ColourDialog',
         'DirDialog',
         'FileDialog',
@@ -144,9 +152,12 @@ _treeList = [
 
     ('Custom Controls', [
         'AnalogClock',
+        'ButtonPanel',
         'ColourSelect',
         'ComboTreeBox',
+        'CustomTreeCtrl',
         'Editor',
+        'FlatNotebook',
         'GenericButtons',
         'GenericDirCtrl',
         'LEDNumberCtrl',
@@ -169,12 +180,12 @@ _treeList = [
         'DatePickerCtrl',
         'DynamicSashWindow',
         'EditableListBox',
+        'ExpandoTextCtrl',
         'FancyText',
         'FileBrowseButton',
         'FloatBar',  
         'FloatCanvas',
         'FoldPanelBar',
-        'GIFAnimationCtrl',
         'HtmlWindow',
         'HyperLinkCtrl',
         'IntCtrl',
@@ -215,6 +226,7 @@ _treeList = [
 
     # ditto
     ('Process and Events', [
+        'DelayedResult',
         'EventManager',
         'KeyEvents',
         'Process',
@@ -234,11 +246,11 @@ _treeList = [
     # Images
     ('Using Images', [
 ##        'AlphaDrawing',
+        'AnimationCtrl',
         'ArtProvider',
         'BitmapFromBuffer',
         'Cursor',
         'DragImage',
-        'GIFAnimationCtrl',
         'Image',
         'ImageAlpha',
         'ImageFromStream',
@@ -1143,8 +1155,11 @@ class wxPythonDemo(wx.Frame):
         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
@@ -1627,7 +1642,8 @@ class wxPythonDemo(wx.Frame):
         self.demoPage = None
         self.codePage = None
         self.mainmenu = None
-        self.tbicon.Destroy()
+        if self.tbicon is not None:
+            self.tbicon.Destroy()
         self.Destroy()