[ 1505048 ] wxHtml rendering of underlined text

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

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index bd08f8ffdd2e9da69a9dcba7d9ae87011c2964f6..11ea138078b91f5bdd11e2e6fbcd14f0fca9d492 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -60,7 +60,8 @@ _treeList = [
         'BitmapFromBuffer',
         'RawBitmapAccess',
         'DragScroller',
         'BitmapFromBuffer',
         'RawBitmapAccess',
         'DragScroller',

-        'AlphaDrawing',
+##        'AlphaDrawing',
+        'DelayedResult',

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


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

+        'DelayedResult',

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


@@ -233,7 +235,7 @@ _treeList = [
 
     # Images
     ('Using Images', [
 
     # Images
     ('Using Images', [

-        'AlphaDrawing',
+##        'AlphaDrawing',

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


@@ -249,7 +251,7 @@ _treeList = [
 
     # Other stuff
     ('Miscellaneous', [
 
     # Other stuff
     ('Miscellaneous', [

-        'AlphaDrawing',
+##        'AlphaDrawing',

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


@@ -1143,8 +1145,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 +1632,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()