update from Vegh Janos

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

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 589f2d39f33ec88ce8a717f799f9fb53321b0ab1..e353972a2db9c4db04c5811eb2b6adb4cfb5d151 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -19,6 +19,15 @@ import wx.html
 import images
 
 ##wx.Trap()
 import images
 
 ##wx.Trap()

+##raw_input("Press a key...")
+
+
+# Use Python's bool constants if available, make aliases if not
+try:
+    True
+except NameError:
+    True = 1==1
+    False = 1==0

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -28,6 +37,9 @@ _treeList = [
     ('Recent Additions', [
         'wxVListBox',
         'wxListbook',
     ('Recent Additions', [
         'wxVListBox',
         'wxListbook',

+        'wxMaskedNumCtrl',
+        'FloatCanvas',
+        'wxXmlResourceSubclass',

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


@@ -100,7 +112,7 @@ _treeList = [
         'wxValidator',
         ]),
 
         'wxValidator',
         ]),
 

-    # controls coming from other librairies
+    # controls coming from other libraries

     ('More Windows/Controls', [
         #'wxFloatBar',          deprecated
         #'wxMVCTree',           deprecated
     ('More Windows/Controls', [
         #'wxFloatBar',          deprecated
         #'wxMVCTree',           deprecated


@@ -109,6 +121,7 @@ _treeList = [
         'ColourSelect',
         'ContextHelp',
         'FancyText',
         'ColourSelect',
         'ContextHelp',
         'FancyText',

+        'FloatCanvas',

         'FileBrowseButton',
         'GenericButtons',
         'MaskedEditControls',
         'FileBrowseButton',
         'GenericButtons',
         'MaskedEditControls',


@@ -128,6 +141,7 @@ _treeList = [
         'wxIntCtrl',
         'wxLEDNumberCtrl',
         'wxMimeTypesManager',
         'wxIntCtrl',
         'wxLEDNumberCtrl',
         'wxMimeTypesManager',

+        'wxMaskedNumCtrl',

         'wxMultiSash',
         'wxPopupControl',
         'wxStyledTextCtrl_1',
         'wxMultiSash',
         'wxPopupControl',
         'wxStyledTextCtrl_1',


@@ -147,6 +161,7 @@ _treeList = [
         'wxScrolledPanel',
         'wxXmlResource',
         'wxXmlResourceHandler',
         'wxScrolledPanel',
         'wxXmlResource',
         'wxXmlResourceHandler',

+        'wxXmlResourceSubclass',

         ]),
 
     # ditto
         ]),
 
     # ditto


@@ -212,6 +227,7 @@ _treeList = [
 
 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------

+# Show how to derive a custom wxLog class

 
 class MyLog(wx.PyLog):
     def __init__(self, textCtrl, logTime=0):
 
 class MyLog(wx.PyLog):
     def __init__(self, textCtrl, logTime=0):


@@ -235,6 +251,7 @@ class MyTP(wx.PyTipProvider):
 # A class to be used to display source code in the demo.  Try using the
 # wxSTC in the wxStyledTextCtrl_2 sample first, fall back to wxTextCtrl
 # if there is an error, such as the stc module not being present.
 # A class to be used to display source code in the demo.  Try using the
 # wxSTC in the wxStyledTextCtrl_2 sample first, fall back to wxTextCtrl
 # if there is an error, such as the stc module not being present.

+#

 
 try:
     ##raise ImportError
 
 try:
     ##raise ImportError


@@ -814,7 +831,7 @@ platform GUI library, which is written in C++.
 <p> Like Python and wxWindows, wxPython is <b>Open Source</b> which
 means that it is free for anyone to use and the source code is
 available for anyone to look at and modify.  Or anyone can contribute
 <p> Like Python and wxWindows, wxPython is <b>Open Source</b> which
 means that it is free for anyone to use and the source code is
 available for anyone to look at and modify.  Or anyone can contribute

-fixes or enhnacments to the project.
+fixes or enhancements to the project.

 
 <p> wxPython is a <b>cross-platform</b> toolkit.  This means that the
 same program will run on multiple platforms without modification.
 
 <p> wxPython is a <b>cross-platform</b> toolkit.  This means that the
 same program will run on multiple platforms without modification.