docstring fix

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

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index b67361889d20cdbc6e58e28fe62cc99075035bc5..e25583b64dfc178fd9cffab6eb0a99d75d238618 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -50,7 +50,6 @@ _treeList = [
         'AnalogClock',
         'AUI_DockingWindowMgr',
         'AUI_Notebook',
         'AnalogClock',
         'AUI_DockingWindowMgr',
         'AUI_Notebook',

-        'BitmapFromBuffer',

         'CheckListCtrlMixin',
         'ComboTreeBox',
         'Pickers',
         'CheckListCtrlMixin',
         'ComboTreeBox',
         'Pickers',


@@ -58,6 +57,17 @@ _treeList = [
         'RichTextCtrl',
         'Treebook',
         'Toolbook',
         'RichTextCtrl',
         'Treebook',
         'Toolbook',

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

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


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

+        'AboutBox',

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


@@ -141,9 +152,12 @@ _treeList = [
 
     ('Custom Controls', [
         'AnalogClock',
 
     ('Custom Controls', [
         'AnalogClock',

+        'ButtonPanel',

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

+        'CustomTreeCtrl',

         'Editor',
         'Editor',

+        'FlatNotebook',

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


@@ -166,12 +180,12 @@ _treeList = [
         'DatePickerCtrl',
         'DynamicSashWindow',
         'EditableListBox',
         'DatePickerCtrl',
         'DynamicSashWindow',
         'EditableListBox',

+        'ExpandoTextCtrl',

         'FancyText',
         'FileBrowseButton',
         'FloatBar',  
         'FloatCanvas',
         'FoldPanelBar',
         'FancyText',
         'FileBrowseButton',
         'FloatBar',  
         'FloatCanvas',
         'FoldPanelBar',

-        'GIFAnimationCtrl',

         'HtmlWindow',
         'HyperLinkCtrl',
         'IntCtrl',
         'HtmlWindow',
         'HyperLinkCtrl',
         'IntCtrl',


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

+        'DelayedResult',

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


@@ -230,22 +245,26 @@ _treeList = [
 
     # Images
     ('Using Images', [
 
     # Images
     ('Using Images', [

+        'AlphaDrawing',
+        'AnimationCtrl',

         'ArtProvider',
         'BitmapFromBuffer',
         'Cursor',
         'DragImage',
         'ArtProvider',
         'BitmapFromBuffer',
         'Cursor',
         'DragImage',

-        'GIFAnimationCtrl',

         'Image',
         'ImageAlpha',
         'ImageFromStream',
         'Mask',
         'Image',
         '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',


@@ -1136,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


@@ -1620,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()