In GetPath(), don't append separator if there's already one at the end

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

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index a741bc01ffa0c5272f500908fb784a409ae3164b..f723cb0874a9c42f907e057ca6b55039e7139370 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -20,70 +20,237 @@ import images
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 
 

+## _treeList = [
+##     ('New since last release', ['wxGenericDirCtrl',
+##                                 'wxImageFromStream',
+##                                 'RowColSizer',
+##                                 'Unicode',
+##                                 'wxFileHistory',
+##                                 ]),
+
+##     ('Windows', ['wxFrame', 'wxDialog', 'wxMiniFrame',
+##                  'wxGrid', 'wxSashWindow',
+##                  'wxScrolledWindow', 'wxSplitterWindow',
+##                  'wxStatusBar', 'wxNotebook',
+##                  'wxHtmlWindow',
+##                  'wxStyledTextCtrl_1', 'wxStyledTextCtrl_2',
+##                  'wxPopupWindow',
+##                  'wxDynamicSashWindow',
+##                  ]),
+
+##     ('Common Dialogs', ['wxColourDialog', 'wxDirDialog', 'wxFileDialog',
+##                         'wxSingleChoiceDialog', 'wxTextEntryDialog',
+##                         'wxFontDialog', 'wxPageSetupDialog', 'wxPrintDialog',
+##                         'wxMessageDialog', 'wxProgressDialog', 'wxFindReplaceDialog',
+##                         ]),
+
+##     ('Controls', ['wxButton', 'wxCheckBox', 'wxCheckListBox', 'wxChoice',
+##                   'wxComboBox', 'wxGauge', 'wxListBox', 'wxListCtrl', 'VirtualListCtrl',
+##                   'wxTextCtrl',
+##                   'wxTreeCtrl', 'wxSpinButton', 'wxSpinCtrl', 'wxStaticText',
+##                   'wxStaticBitmap', 'wxRadioBox', 'wxSlider', 'wxToolBar',
+##                   'wxCalendarCtrl', 'wxToggleButton',
+##                   'wxEditableListBox', 'wxLEDNumberCtrl',
+##                   ]),
+
+##     ('Window Layout', ['wxLayoutConstraints', 'LayoutAnchors', 'Sizers', 'XML_Resource',
+##                        'RowColSizer',
+##                        ]),
+
+##     ('Miscellaneous', [ 'DragAndDrop', 'CustomDragAndDrop', 'URLDragAndDrop',
+##                         'FontEnumerator',
+##                         'wxTimer', 'wxValidator', 'wxGLCanvas', 'DialogUnits',
+##                         'wxImage', 'wxMask', 'PrintFramework', 'wxOGL',
+##                         'PythonEvents', 'Threads',
+##                         'ActiveXWrapper_Acrobat', 'ActiveXWrapper_IE',
+##                         'wxDragImage', "wxProcess", "FancyText", "OOR", "wxWave",
+##                         'wxJoystick', 'DrawXXXList', 'ErrorDialogs', 'wxMimeTypesManager',
+##                         'ContextHelp', 'SplitTree', 'Unicode', 'wxFileHistory',
+##                         ]),
+
+##     ('wxPython Library', ['Layoutf', 'wxScrolledMessageDialog',
+##                           'wxMultipleChoiceDialog', 'wxPlotCanvas', 'wxFloatBar',
+##                           'wxCalendar', 'wxMVCTree', 'wxVTKRenderWindow',
+##                           'FileBrowseButton', 'GenericButtons', 'wxEditor',
+##                           'ColourSelect', 'ImageBrowser',
+##                           'infoframe', 'ColourDB', 'PyCrust', 'PyCrustWithFilling',
+##                           'TablePrint',
+##                           'wxRightTextCtrl',
+##                           ]),
+
+##     ('Cool Contribs', ['pyTree', 'hangman',
+##                        #'SlashDot',
+##                        'XMLtreeview'
+##                        ]),
+
+##     ]
+
+

 _treeList = [
 _treeList = [

-    ('New since last release', ['wxGenericDirCtrl',
-                                'wxImageFromStream',
-                                'RowColSizer',
-                                'Unicode',
-                                'wxFileHistory',
-                                ]),
-
-    ('Windows', ['wxFrame', 'wxDialog', 'wxMiniFrame',
-                 'wxGrid', 'wxSashWindow',
-                 'wxScrolledWindow', 'wxSplitterWindow',
-                 'wxStatusBar', 'wxNotebook',
-                 'wxHtmlWindow',
-                 'wxStyledTextCtrl_1', 'wxStyledTextCtrl_2',
-                 'wxPopupWindow',
-                 'wxDynamicSashWindow',
-                 ]),
-
-    ('Common Dialogs', ['wxColourDialog', 'wxDirDialog', 'wxFileDialog',
-                        'wxSingleChoiceDialog', 'wxTextEntryDialog',
-                        'wxFontDialog', 'wxPageSetupDialog', 'wxPrintDialog',
-                        'wxMessageDialog', 'wxProgressDialog', 'wxFindReplaceDialog',
-                        ]),
-
-    ('Controls', ['wxButton', 'wxCheckBox', 'wxCheckListBox', 'wxChoice',
-                  'wxComboBox', 'wxGauge', 'wxListBox', 'wxListCtrl', 'VirtualListCtrl',
-                  'wxTextCtrl',
-                  'wxTreeCtrl', 'wxSpinButton', 'wxSpinCtrl', 'wxStaticText',
-                  'wxStaticBitmap', 'wxRadioBox', 'wxSlider', 'wxToolBar',
-                  'wxCalendarCtrl', 'wxToggleButton',
-                  'wxEditableListBox', 'wxLEDNumberCtrl',
-                  ]),
-
-    ('Window Layout', ['wxLayoutConstraints', 'LayoutAnchors', 'Sizers', 'XML_Resource',
-                       'RowColSizer',
-                       ]),
-
-    ('Miscellaneous', [ 'DragAndDrop', 'CustomDragAndDrop', 'URLDragAndDrop',
-                        'FontEnumerator',
-                        'wxTimer', 'wxValidator', 'wxGLCanvas', 'DialogUnits',
-                        'wxImage', 'wxMask', 'PrintFramework', 'wxOGL',
-                        'PythonEvents', 'Threads',
-                        'ActiveXWrapper_Acrobat', 'ActiveXWrapper_IE',
-                        'wxDragImage', "wxProcess", "FancyText", "OOR", "wxWave",
-                        'wxJoystick', 'DrawXXXList', 'ErrorDialogs', 'wxMimeTypesManager',
-                        'ContextHelp', 'SplitTree', 'Unicode', 'wxFileHistory',
-                        ]),
-
-    ('wxPython Library', ['Layoutf', 'wxScrolledMessageDialog',
-                          'wxMultipleChoiceDialog', 'wxPlotCanvas', 'wxFloatBar',
-                          'wxCalendar', 'wxMVCTree', 'wxVTKRenderWindow',
-                          'FileBrowseButton', 'GenericButtons', 'wxEditor',
-                          'ColourSelect', 'ImageBrowser',
-                          'infoframe', 'ColourDB', 'PyCrust', 'PyCrustWithFilling',
-                          'TablePrint',
-                          'wxRightTextCtrl',
-                          ]),
-
-    ('Cool Contribs', ['pyTree', 'hangman',
-                       #'SlashDot',
-                       'XMLtreeview'
-                       ]),
-
-    ]
+    # new stuff
+    ('New since last release', [
+        'RowColSizer',
+        'Unicode',
+        'wxFileHistory',
+        'wxGenericDirCtrl',
+        'wxImageFromStream',
+        ]),
+
+    # managed windows == things with a caption you can close
+    ('Base Frames and Dialogs', [
+        'wxDialog',
+        'wxFrame',
+        'wxMDIWindows',
+        'wxMiniFrame',
+        ]),
+
+    # the common dialogs
+    ('Common Dialogs', [
+        'wxColourDialog',
+        'wxDirDialog',
+        'wxFileDialog',
+        'wxFindReplaceDialog',
+        'wxFontDialog',
+        'wxMessageDialog',
+        'wxPageSetupDialog',
+        'wxPrintDialog',
+        'wxProgressDialog',
+        'wxSingleChoiceDialog',
+        'wxTextEntryDialog',
+        ]),
+
+    # dialogs form libraries
+    ('More Dialogs', [
+        'ErrorDialogs',
+        'ImageBrowser',
+        'wxMultipleChoiceDialog',
+        'wxScrolledMessageDialog',
+        ]),
+
+    # core controls
+    ('Core Windows/Controls', [
+        'VirtualListCtrl',
+        'wxButton',
+        'wxCheckBox',
+        'wxCheckListBox',
+        'wxChoice',
+        'wxComboBox',
+        'wxGauge',
+        'wxGenericDirCtrl',
+        'wxGrid',
+        'wxListBox',
+        'wxListCtrl',
+        'wxNotebook',
+        'wxPopupWindow',
+        'wxRadioBox',
+        'wxSashWindow',
+        'wxSlider',
+        'wxScrolledWindow',
+        'wxSplitterWindow',
+        'wxSpinButton',
+        'wxSpinCtrl',
+        'wxStaticText',
+        'wxStaticBitmap',
+        'wxStatusBar',
+        'wxTextCtrl',
+        'wxTimer',
+        'wxToggleButton',
+        'wxToolBar',
+        'wxTreeCtrl',
+        'wxValidator',
+        ]),
+
+    # controls coming from other librairies
+    ('More Windows/Controls', [
+        'ColourSelect',
+        'ContextHelp',
+        'FancyText',
+        'FileBrowseButton',
+        'GenericButtons',
+        'PyCrust',
+        'PyCrustWithFilling',
+        'SplitTree',
+        'TablePrint',
+        'wxCalendar',
+        'wxCalendarCtrl',
+        'wxDynamicSashWindow',
+        'wxEditableListBox',
+        'wxEditor',
+        'wxFloatBar',
+        'wxHtmlWindow',
+        'wxLEDNumberCtrl',
+        'wxMimeTypesManager',
+        'wxMVCTree',
+        'wxStyledTextCtrl_1',
+        'wxStyledTextCtrl_2',
+        'wxRightTextCtrl',
+        ]),
+
+    # How to lay out the controls in a frame/dialog
+    ('Window Layout', [
+        'LayoutAnchors',
+        'Layoutf',
+        'RowColSizer',
+        'Sizers',
+        'wxLayoutConstraints',
+        'XML_Resource',
+        ]),
+
+    # ditto
+    ('Process and Events', [
+        'infoframe',
+        'OOR',
+        'PythonEvents',
+        'Threads',
+        'wxProcess',
+        'wxTimer',
+        ]),
+
+    # Clipboard and DnD
+    ('Clipboard and DnD', [
+        'CustomDragAndDrop',
+        'DragAndDrop',
+        'URLDragAndDrop',
+        ]),
+
+    # Images
+    ('Images', [
+        'wxDragImage',
+        'wxImage',
+        'wxImageFromStream',
+        'wxMask',
+        ]),
+
+    # Other stuff
+    ('Miscellaneous', [
+        'ColourDB',
+        'DialogUnits',
+        'DrawXXXList',
+        'FontEnumerator',
+        'PrintFramework',
+        'Unicode',
+        'wxFileHistory',
+        'wxJoystick',
+        'wxOGL',
+        'wxWave',
+        ]),
+
+    # need libs not coming with the demo
+    ('Objects using an external library', [
+        'ActiveXWrapper_Acrobat',
+        'ActiveXWrapper_IE',
+        'wxGLCanvas',
+        'wxPlotCanvas',
+        'wxVTKRenderWindow',
+        ]),
+
+    # pyTree, hangman, ... in the samples dir
+    ('Check out the samples dir too', [
+        ]),
+
+]
+
+

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


@@ -215,24 +382,8 @@ class wxPythonDemo(wxFrame):
         self.nb = wxNotebook(splitter2, -1, style=wxCLIP_CHILDREN)
 
         # Set up a wxHtmlWindow on the Overview Notebook page
         self.nb = wxNotebook(splitter2, -1, style=wxCLIP_CHILDREN)
 
         # Set up a wxHtmlWindow on the Overview Notebook page

-        # we put it in a panel first because there seems to be a
-        # refresh bug of some sort (wxGTK) when it is directly in
-        # the notebook...
-        if 0:  # the old way
-            self.ovr = wxHtmlWindow(self.nb, -1, size=(400, 400))
-            self.nb.AddPage(self.ovr, self.overviewText)
-
-        else:  # hopefully I can remove this hacky code soon, see bug #216861
-            panel = wxPanel(self.nb, -1, style=wxCLIP_CHILDREN)
-            self.ovr = wxHtmlWindow(panel, -1, size=(400, 400))
-            self.nb.AddPage(panel, self.overviewText)
-
-            def OnOvrSize(evt, ovr=self.ovr):
-                ovr.SetSize(evt.GetSize())
-
-            EVT_SIZE(panel, OnOvrSize)
-            EVT_ERASE_BACKGROUND(panel, EmptyHandler)
-
+        self.ovr = wxHtmlWindow(self.nb, -1, size=(400, 400))
+        self.nb.AddPage(self.ovr, self.overviewText)

 
         self.SetOverview(self.overviewText, overview)
 
 
         self.SetOverview(self.overviewText, overview)
 


@@ -312,7 +463,7 @@ class wxPythonDemo(wxFrame):
         pt = event.GetPosition();
         item, flags = self.tree.HitTest(pt)
         if item == self.tree.GetSelection():
         pt = event.GetPosition();
         item, flags = self.tree.HitTest(pt)
         if item == self.tree.GetSelection():

-            self.SetOverview(self.tree.GetItemText(item), self.curOverview)
+            self.SetOverview(self.tree.GetItemText(item)+" Overview", self.curOverview)

         event.Skip()
 
     #---------------------------------------------
         event.Skip()
 
     #---------------------------------------------