fixed incorrect computation of window's visible area: window's position was added...

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

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index bd08f8ffdd2e9da69a9dcba7d9ae87011c2964f6..c7bbb1b03e63c49e60880a7cff46eecdb171f8ac 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -60,7 +60,9 @@ _treeList = [
         'BitmapFromBuffer',
         'RawBitmapAccess',
         'DragScroller',
-        'AlphaDrawing',
+##        'AlphaDrawing',
+        'DelayedResult',
+        'ExpandoTextCtrl',
         ]),
 
     # managed windows == things with a (optional) caption you can close
@@ -169,6 +171,7 @@ _treeList = [
         'DatePickerCtrl',
         'DynamicSashWindow',
         'EditableListBox',
+        'ExpandoTextCtrl',
         'FancyText',
         'FileBrowseButton',
         'FloatBar',  
@@ -215,6 +218,7 @@ _treeList = [
 
     # ditto
     ('Process and Events', [
+        'DelayedResult',
         'EventManager',
         'KeyEvents',
         'Process',
@@ -233,7 +237,7 @@ _treeList = [
 
     # Images
     ('Using Images', [
-        'AlphaDrawing',
+##        'AlphaDrawing',
         'ArtProvider',
         'BitmapFromBuffer',
         'Cursor',
@@ -249,7 +253,7 @@ _treeList = [
 
     # Other stuff
     ('Miscellaneous', [
-        'AlphaDrawing',
+##        'AlphaDrawing',
         'ColourDB',
         ##'DialogUnits',   # needs more explanations
         'DragScroller',
@@ -1143,8 +1147,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 +1634,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()