projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
extracted common code of ToLong and ToULong in a separate template helper
[wxWidgets.git]
/
wxPython
/
demo
/
Main.py
diff --git
a/wxPython/demo/Main.py
b/wxPython/demo/Main.py
index b67361889d20cdbc6e58e28fe62cc99075035bc5..4fe49880155cd2fef9c1568ad0dda0dac73d378c 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,18
@@
_treeList = [
'RichTextCtrl',
'Treebook',
'Toolbook',
'RichTextCtrl',
'Treebook',
'Toolbook',
+ 'BitmapFromBuffer',
+ 'RawBitmapAccess',
+ 'DragScroller',
+ 'DelayedResult',
+ 'ExpandoTextCtrl',
+ 'ButtonPanel',
+ 'FlatNotebook',
+ 'CustomTreeCtrl',
+ 'AboutBox',
+ 'AnimateCtrl',
+ 'AlphaDrawing',
+ 'GraphicsContext',
]),
# managed windows == things with a (optional) caption you can close
]),
# managed windows == things with a (optional) caption you can close
@@
-72,6
+83,7
@@
_treeList = [
# the common dialogs
('Common Dialogs', [
# the common dialogs
('Common Dialogs', [
+ 'AboutBox',
'ColourDialog',
'DirDialog',
'FileDialog',
'ColourDialog',
'DirDialog',
'FileDialog',
@@
-141,9
+153,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
+181,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
+227,7
@@
_treeList = [
# ditto
('Process and Events', [
# ditto
('Process and Events', [
+ 'DelayedResult',
'EventManager',
'KeyEvents',
'Process',
'EventManager',
'KeyEvents',
'Process',
@@
-230,25
+246,30
@@
_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',
+ 'GraphicsContext',
'GLCanvas',
'Joystick',
'MimeTypesManager',
'GLCanvas',
'Joystick',
'MimeTypesManager',
@@
-1136,8
+1157,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
+1644,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()