another merge from WX_2_6_BRANCH

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-06 07:05:15 +00:00
parent 2091f5e71a
commit 095315e20d
41 changed files with 3008 additions and 38638 deletions
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -52,6 +52,7 @@ _treeList = [
        'HyperLinkCtrl',
        'MultiSplitterWindow',
        'Throbber',
+        'GetMouseState',
        ]),

    # managed windows == things with a (optional) caption you can close
@@ -82,7 +83,6 @@ _treeList = [
    # dialogs from libraries
    ('More Dialogs', [
        'ImageBrowser',
-        'MultipleChoiceDialog',
        'ScrolledMessageDialog',
        ]),