Warning fix.

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

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index d0711e384f9a3206bd3a37cd5cead146872f94a3..b6a429c4a59f5a42841e72909259b3200ebf40f9 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -36,8 +36,8 @@ import images
 
 # For debugging
 ##wx.Trap();
 
 # For debugging
 ##wx.Trap();

-##print "wx.VERSION_STRING = ", wx.VERSION_STRING
-##print os.getpid();
+##print "wx.VERSION_STRING = %s (%s)" % (wx.VERSION_STRING, wx.USE_UNICODE and 'unicode' or 'ansi')
+##print "pid:", os.getpid()

 ##raw_input("Press Enter...")
 
 
 ##raw_input("Press Enter...")
 
 


@@ -47,13 +47,11 @@ import images
 _treeList = [
     # new stuff
     ('Recent Additions/Updates', [
 _treeList = [
     # new stuff
     ('Recent Additions/Updates', [

-        'FoldPanelBar',
-        'GIFAnimationCtrl',
-        'HyperLinkCtrl',
-        'MultiSplitterWindow',
-        'Throbber',
-        'GetMouseState',
-        'FloatCanvas',
+        'AnalogClock',
+        'CheckListCtrlMixin',
+        'RichTextCtrl',
+        'Treebook',
+        'Toolbook',

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


@@ -94,7 +92,6 @@ _treeList = [
         'CheckBox',
         'CheckListBox',
         'Choice',
         'CheckBox',
         'CheckListBox',
         'Choice',

-        'Choicebook',

         'ComboBox',
         'Gauge',
         'Grid',
         'ComboBox',
         'Gauge',
         'Grid',


@@ -103,9 +100,7 @@ _treeList = [
         'ListCtrl',
         'ListCtrl_virtual',
         'ListCtrl_edit',
         'ListCtrl',
         'ListCtrl_virtual',
         'ListCtrl_edit',

-        'Listbook',

         'Menu',
         'Menu',

-        'Notebook',

         'PopupMenu',
         'PopupWindow',
         'RadioBox',
         'PopupMenu',
         'PopupWindow',
         'RadioBox',


@@ -127,9 +122,17 @@ _treeList = [
         'TreeCtrl',
         'Validator',
         ]),
         'TreeCtrl',
         'Validator',
         ]),

+    
+    ('"Book" Controls', [
+        'Choicebook',
+        'Listbook',
+        'Notebook',
+        'Toolbook',
+        'Treebook',
+        ]),

 
     ('Custom Controls', [
 
     ('Custom Controls', [

-        'AnalogClockWindow',
+        'AnalogClock',

         'ColourSelect',
         'Editor',
         'GenericButtons',
         'ColourSelect',
         'Editor',
         'GenericButtons',


@@ -149,6 +152,7 @@ _treeList = [
         #'RightTextCtrl',     deprecated as we have wxTE_RIGHT now.
         'Calendar',
         'CalendarCtrl',
         #'RightTextCtrl',     deprecated as we have wxTE_RIGHT now.
         'Calendar',
         'CalendarCtrl',

+        'CheckListCtrlMixin',

         'ContextHelp',
         'DatePickerCtrl',
         'DynamicSashWindow',
         'ContextHelp',
         'DatePickerCtrl',
         'DynamicSashWindow',


@@ -170,6 +174,7 @@ _treeList = [
         'PyCrust',
         'PyPlot',
         'PyShell',
         'PyCrust',
         'PyPlot',
         'PyShell',

+        'RichTextCtrl',

         'ScrolledPanel',
         'SplitTree',
         'StyledTextCtrl_1',
         'ScrolledPanel',
         'SplitTree',
         'StyledTextCtrl_1',


@@ -455,7 +460,7 @@ try:
                                   'fore:#000000,back:#FFFFFF,face:Courier New,size:9')
             else:
                 self.StyleSetSpec(stc.STC_STYLE_DEFAULT, 
                                   'fore:#000000,back:#FFFFFF,face:Courier New,size:9')
             else:
                 self.StyleSetSpec(stc.STC_STYLE_DEFAULT, 

-                                  'fore:#000000,back:#FFFFFF,face:Courier,size:12')
+                                  'fore:#000000,back:#FFFFFF,face:Courier,size:9')

     
             # Clear styles and revert to default.
             self.StyleClearAll()
     
             # Clear styles and revert to default.
             self.StyleClearAll()