forgot to commit during last regeneration

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

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index e8791ef031fb4fbeb07582b7bbb59a253d740309..ec9b65f6643e80c6d00387f6c2722b42f26189f1 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -57,6 +57,16 @@ _treeList = [
         'RichTextCtrl',
         'Treebook',
         'Toolbook',
         'RichTextCtrl',
         'Treebook',
         'Toolbook',

+        'BitmapFromBuffer',
+        'RawBitmapAccess',
+        'DragScroller',
+##        'AlphaDrawing',
+        'DelayedResult',
+        'ExpandoTextCtrl',
+        'ButtonPanel',
+        'FlatNotebook',
+        'CustomTreeCtrl',
+        'AboutBox',

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


@@ -71,6 +81,7 @@ _treeList = [
 
     # the common dialogs
     ('Common Dialogs', [
 
     # the common dialogs
     ('Common Dialogs', [

+        'AboutBox',

         'ColourDialog',
         'DirDialog',
         'FileDialog',
         'ColourDialog',
         'DirDialog',
         'FileDialog',


@@ -140,9 +151,12 @@ _treeList = [
 
     ('Custom Controls', [
         'AnalogClock',
 
     ('Custom Controls', [
         'AnalogClock',

+        'ButtonPanel',

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

+        'CustomTreeCtrl',

         'Editor',
         'Editor',

+        'FlatNotebook',

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


@@ -165,6 +179,7 @@ _treeList = [
         'DatePickerCtrl',
         'DynamicSashWindow',
         'EditableListBox',
         'DatePickerCtrl',
         'DynamicSashWindow',
         'EditableListBox',

+        'ExpandoTextCtrl',

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


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

+        'DelayedResult',

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


@@ -229,7 +245,9 @@ _treeList = [
 
     # Images
     ('Using Images', [
 
     # Images
     ('Using Images', [

+##        'AlphaDrawing',

         'ArtProvider',
         'ArtProvider',

+        'BitmapFromBuffer',

         'Cursor',
         'DragImage',
         'GIFAnimationCtrl',
         'Cursor',
         'DragImage',
         'GIFAnimationCtrl',


@@ -237,13 +255,16 @@ _treeList = [
         'ImageAlpha',
         'ImageFromStream',
         'Mask',
         'ImageAlpha',
         'ImageFromStream',
         'Mask',

+        'RawBitmapAccess',

         'Throbber',
         ]),
 
     # Other stuff
     ('Miscellaneous', [
         'Throbber',
         ]),
 
     # Other stuff
     ('Miscellaneous', [

+##        'AlphaDrawing',

         'ColourDB',
         ##'DialogUnits',   # needs more explanations
         'ColourDB',
         ##'DialogUnits',   # needs more explanations

+        'DragScroller',

         'DrawXXXList',
         'FileHistory',
         'FontEnumerator',
         'DrawXXXList',
         'FileHistory',
         'FontEnumerator',


@@ -1134,8 +1155,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


@@ -1618,7 +1642,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()