X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9159fe8e8f1b3653c506805cbb79280aa2a0f38..9c67cbec021bf8d96c428b9f376b08a851c0864b:/wxPython/demo/Main.py

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index b4bca26df9..bfaff9c5eb 100644
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -20,69 +20,243 @@ 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 = [
-    ('New since last release', ['wxGenericDirCtrl',
-                                'wxImageFromStream',
-                                'RowColSizer',
-                                'Unicode',
-                                ]),
-
-    ('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',
-                        ]),
-
-    ('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', [
+        ]),
+
+    #~ ('Cool Contribs', [
+        #~ 'pyTree',
+        #~ 'hangman',
+        #'SlashDot',
+        #~ 'XMLtreeview'
+        #~ ]),
+]
+
+
 
 #---------------------------------------------------------------------------
 
@@ -132,6 +306,7 @@ class wxPythonDemo(wxFrame):
 
 
         self.otherWin = None
+        self.showTip = true
         EVT_IDLE(self, self.OnIdle)
         EVT_CLOSE(self, self.OnCloseWindow)
         EVT_ICONIZE(self, self.OnIconfiy)
@@ -244,8 +419,11 @@ class wxPythonDemo(wxFrame):
         # Set up a log on the View Log Notebook page
         self.log = wxTextCtrl(splitter2, -1,
                               style = wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL)
+
         # Set the wxWindows log target to be this textctrl
         #wxLog_SetActiveTarget(wxLogTextCtrl(self.log))
+
+        # But instead of the above we want to show how to use our own wxLog class
         wxLog_SetActiveTarget(MyLog(self.log))
 
 
@@ -413,6 +591,25 @@ class wxPythonDemo(wxFrame):
             self.window = self.otherWin
             self.otherWin = None
 
+        if self.showTip:
+            self.ShowTip()
+            self.showTip = false
+
+
+    #---------------------------------------------
+    def ShowTip(self):
+        try:
+            showTipText = open(opj("data/showTips")).read()
+            showTip, index = eval(showTipText)
+        except IOError:
+            showTip, index = (1, 0)
+        if showTip:
+            tp = wxCreateFileTipProvider(opj("data/tips.txt"), index)
+            showTip = wxShowTip(self, tp)
+            index = tp.GetCurrentTip()
+            open(opj("data/showTips"), "w").write(str( (showTip, index) ))
+
+
     #---------------------------------------------
     def OnDemoMenu(self, event):
         try:
@@ -480,21 +677,7 @@ class MySplashScreen(wxSplashScreen):
     def OnClose(self, evt):
         frame = wxPythonDemo(None, -1, "wxPython: (A Demonstration)")
         frame.Show(true)
-        self.ShowTip(frame)
-        self.Destroy()
-
-    def ShowTip(self, frame):
-        try:
-            showTipText = open(opj("data/showTips")).read()
-            showTip, index = eval(showTipText)
-        except IOError:
-            showTip, index = (1, 0)
-        if showTip:
-            tp = wxCreateFileTipProvider(opj("data/tips.txt"), index)
-            showTip = wxShowTip(frame, tp)
-            index = tp.GetCurrentTip()
-            open(opj("data/showTips"), "w").write(str( (showTip, index) ))
-
+        evt.Skip()  # Make sure the default handler runs too...
 
 
 class MyApp(wxApp):
@@ -506,7 +689,6 @@ class MyApp(wxApp):
         wxInitAllImageHandlers()
         splash = MySplashScreen()
         splash.Show()
-        wxYield()
         return true