X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7e664d85e6512d807ce2eb186ed9e0bbd60d6e8b..45c0ea45ff926dad0071eda3fc17f5136bcfbf77:/wxPython/demo/Main.py

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index c89232c979..11ea138078 100644
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -48,18 +48,25 @@ _treeList = [
     # new stuff
     ('Recent Additions/Updates', [
         'AnalogClock',
-        'AUI',
+        'AUI_DockingWindowMgr',
+        'AUI_Notebook',
         'CheckListCtrlMixin',
+        'ComboTreeBox',
         'Pickers',
         'PseudoDC',
         'RichTextCtrl',
         'Treebook',
         'Toolbook',
+        'BitmapFromBuffer',
+        'RawBitmapAccess',
+        'DragScroller',
+##        'AlphaDrawing',
+        'DelayedResult',
         ]),
 
     # managed windows == things with a (optional) caption you can close
     ('Frames and Dialogs', [
-        'AUI',
+        'AUI_DockingWindowMgr',
         'Dialog',
         'Frame',
         'MDIWindows',
@@ -128,6 +135,7 @@ _treeList = [
         ]),
     
     ('"Book" Controls', [
+        'AUI_Notebook',
         'Choicebook',
         'Listbook',
         'Notebook',
@@ -138,6 +146,7 @@ _treeList = [
     ('Custom Controls', [
         'AnalogClock',
         'ColourSelect',
+        'ComboTreeBox',
         'Editor',
         'GenericButtons',
         'GenericDirCtrl',
@@ -207,6 +216,7 @@ _treeList = [
 
     # ditto
     ('Process and Events', [
+        'DelayedResult',
         'EventManager',
         'KeyEvents',
         'Process',
@@ -225,7 +235,9 @@ _treeList = [
 
     # Images
     ('Using Images', [
+##        'AlphaDrawing',
         'ArtProvider',
+        'BitmapFromBuffer',
         'Cursor',
         'DragImage',
         'GIFAnimationCtrl',
@@ -233,13 +245,16 @@ _treeList = [
         'ImageAlpha',
         'ImageFromStream',
         'Mask',
+        'RawBitmapAccess',
         'Throbber',
         ]),
 
     # Other stuff
     ('Miscellaneous', [
+##        'AlphaDrawing',
         'ColourDB',
         ##'DialogUnits',   # needs more explanations
+        'DragScroller',
         'DrawXXXList',
         'FileHistory',
         'FontEnumerator',
@@ -1130,8 +1145,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
@@ -1614,7 +1632,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()