Fixes to avoid an endless event looping for wxGTK

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

diff --git a/utils/wxPython/demo/Main.py b/utils/wxPython/demo/Main.py
index 175b0c4e151d38a04f28b14b320dc6d3adee11b0..fea3339ceb8cffc59e0eab2b525628907f8d869c 100644 (file)
--- a/utils/wxPython/demo/Main.py
+++ b/utils/wxPython/demo/Main.py
@@ -13,17 +13,23 @@
 
 import sys, os
 from   wxPython.wx import *
 
 import sys, os
 from   wxPython.wx import *

-
+from   wxPython.lib.splashscreen import SplashScreen

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

+_useSplitter       = true
+_useNestedSplitter = true

 
 _treeList = [
 
 _treeList = [

+    ('New since last release', ['wxMVCTree', 'wxVTKRenderWindow',
+                                'FileBrowseButton', 'GenericButtons',
+                                'wxMask', 'wxEditor']),
+

     ('Managed Windows', ['wxFrame', 'wxDialog', 'wxMiniFrame']),
 
     ('Managed Windows', ['wxFrame', 'wxDialog', 'wxMiniFrame']),
 

-    ('Miscellaneous Windows', ['wxGrid', 'wxSashWindow',
+    ('Non-Managed Windows', ['wxGrid', 'wxSashWindow',

                                'wxScrolledWindow', 'wxSplitterWindow',
                                'wxScrolledWindow', 'wxSplitterWindow',

-                               'wxStatusBar', 'wxToolBar', 'wxNotebook',
+                               'wxStatusBar', 'wxNotebook',

                                'wxHtmlWindow']),
 
     ('Common Dialogs', ['wxColourDialog', 'wxDirDialog', 'wxFileDialog',
                                'wxHtmlWindow']),
 
     ('Common Dialogs', ['wxColourDialog', 'wxDirDialog', 'wxFileDialog',


@@ -34,15 +40,20 @@ _treeList = [
     ('Controls', ['wxButton', 'wxCheckBox', 'wxCheckListBox', 'wxChoice',
                   'wxComboBox', 'wxGauge', 'wxListBox', 'wxListCtrl', 'wxTextCtrl',
                   'wxTreeCtrl', 'wxSpinButton', 'wxStaticText', 'wxStaticBitmap',
     ('Controls', ['wxButton', 'wxCheckBox', 'wxCheckListBox', 'wxChoice',
                   'wxComboBox', 'wxGauge', 'wxListBox', 'wxListCtrl', 'wxTextCtrl',
                   'wxTreeCtrl', 'wxSpinButton', 'wxStaticText', 'wxStaticBitmap',

-                  'wxRadioBox', 'wxSlider']),
+                  'wxRadioBox', 'wxSlider', 'wxToolBar', #'wxToggleButton'
+                  ]),

 
 

-    ('Window Layout', ['wxLayoutConstraints', 'Sizers']),
+    ('Window Layout', ['wxLayoutConstraints', 'Sizers', 'OldSizers']),

 
 

-    ('Miscellaneous', ['wxTimer', 'wxGLCanvas', 'DialogUnits', 'wxImage',
-                      'PrintFramework', 'wxOGL']),
+    ('Miscellaneous', [ 'DragAndDrop', 'CustomDragAndDrop', 'FontEnumerator',
+                        'wxTimer', 'wxValidator', 'wxGLCanvas', 'DialogUnits',
+                        'wxImage', 'wxMask', 'PrintFramework', 'wxOGL',
+                        'PythonEvents', 'Threads']),

 
 

-    ('wxPython Library', ['Sizers', 'Layoutf', 'wxScrolledMessageDialog',
-                          'wxMultipleChoiceDialog', 'wxPlotCanvas']),
+    ('wxPython Library', ['Layoutf', 'wxScrolledMessageDialog',
+                          'wxMultipleChoiceDialog', 'wxPlotCanvas', 'wxFloatBar',
+                          'PyShell', 'wxCalendar', 'wxMVCTree', 'wxVTKRenderWindow',
+                          'FileBrowseButton', 'GenericButtons', 'wxEditor']),

 
     ('Cool Contribs', ['pyTree', 'hangman', 'SlashDot', 'XMLtreeview']),
 
 
     ('Cool Contribs', ['pyTree', 'hangman', 'SlashDot', 'XMLtreeview']),
 


@@ -52,8 +63,10 @@ _treeList = [
 
 class wxPythonDemo(wxFrame):
     def __init__(self, parent, id, title):
 
 class wxPythonDemo(wxFrame):
     def __init__(self, parent, id, title):

-        wxFrame.__init__(self, parent, -1, title,
-                         wxDefaultPosition, wxSize(700, 550))
+        wxFrame.__init__(self, parent, -1, title, size = (725, 550))
+
+        self.cwd = os.getcwd()
+

         if wxPlatform == '__WXMSW__':
             self.icon = wxIcon('bitmaps/mondrian.ico', wxBITMAP_TYPE_ICO)
             self.SetIcon(self.icon)
         if wxPlatform == '__WXMSW__':
             self.icon = wxIcon('bitmaps/mondrian.ico', wxBITMAP_TYPE_ICO)
             self.SetIcon(self.icon)


@@ -63,8 +76,24 @@ class wxPythonDemo(wxFrame):
 
         self.Centre(wxBOTH)
         self.CreateStatusBar(1, wxST_SIZEGRIP)
 
         self.Centre(wxBOTH)
         self.CreateStatusBar(1, wxST_SIZEGRIP)

-        splitter = wxSplitterWindow(self, -1)
-        splitter2 = wxSplitterWindow(splitter, -1)
+
+        if _useSplitter:
+            splitter = wxSplitterWindow(self, -1)
+            if _useNestedSplitter:
+                splitter2 = wxSplitterWindow(splitter, -1)
+                logParent = nbParent = splitter2
+            else:
+                nbParent = splitter
+                logParent = wxFrame(self, -1, "wxPython Demo: log window",
+                                (0,0), (500, 150))
+                logParent.Show(true)
+        else:
+            nbParent = self
+            logParent = wxFrame(self, -1, "wxPython Demo: log window",
+                                (0,0), (500, 150))
+            logParent.Show(true)
+
+

 
         # Prevent TreeCtrl from displaying all items after destruction
         self.dying = false
 
         # Prevent TreeCtrl from displaying all items after destruction
         self.dying = false


@@ -72,9 +101,9 @@ class wxPythonDemo(wxFrame):
         # Make a File menu
         self.mainmenu = wxMenuBar()
         menu = wxMenu()
         # Make a File menu
         self.mainmenu = wxMenuBar()
         menu = wxMenu()

-        mID = wxNewId()
-        menu.Append(mID, 'E&xit', 'Get the heck outta here!')
-        EVT_MENU(self, mID, self.OnFileExit)
+        exitID = wxNewId()
+        menu.Append(exitID, 'E&xit\tAlt-X', 'Get the heck outta here!')
+        EVT_MENU(self, exitID, self.OnFileExit)

         self.mainmenu.Append(menu, '&File')
 
         # Make a Demo menu
         self.mainmenu.Append(menu, '&File')
 
         # Make a Demo menu


@@ -90,32 +119,41 @@ class wxPythonDemo(wxFrame):
 
 
         # Make a Help menu
 
 
         # Make a Help menu

-        mID = wxNewId()
+        helpID = wxNewId()

         menu = wxMenu()
         menu = wxMenu()

-        menu.Append(mID, '&About', 'wxPython RULES!!!')
-        EVT_MENU(self, mID, self.OnHelpAbout)
+        menu.Append(helpID, '&About\tCtrl-H', 'wxPython RULES!!!')
+        EVT_MENU(self, helpID, self.OnHelpAbout)

         self.mainmenu.Append(menu, '&Help')
         self.SetMenuBar(self.mainmenu)
 
         self.mainmenu.Append(menu, '&Help')
         self.SetMenuBar(self.mainmenu)
 

+        # set the menu accellerator table...
+        aTable = wxAcceleratorTable([(wxACCEL_ALT,  ord('X'), exitID),
+                                     (wxACCEL_CTRL, ord('H'), helpID)])
+        self.SetAcceleratorTable(aTable)

 
 

-        # Create a TreeCtrl
-        tID = wxNewId()
-        self.treeMap = {}
-        self.tree = wxTreeCtrl(splitter, tID)
-        root = self.tree.AddRoot("Overview")
-        for item in _treeList:
-            child = self.tree.AppendItem(root, item[0])
-            for childItem in item[1]:
-                theDemo = self.tree.AppendItem(child, childItem)
-                self.treeMap[childItem] = theDemo

 
 

-        self.tree.Expand(root)
-        EVT_TREE_ITEM_EXPANDED   (self.tree, tID, self.OnItemExpanded)
-        EVT_TREE_ITEM_COLLAPSED  (self.tree, tID, self.OnItemCollapsed)
-        EVT_TREE_SEL_CHANGED     (self.tree, tID, self.OnSelChanged)
+        # Create a TreeCtrl
+        if _useSplitter:
+            tID = wxNewId()
+            self.treeMap = {}
+            self.tree = wxTreeCtrl(splitter, tID)
+            root = self.tree.AddRoot("Overview")
+            firstChild = None
+            for item in _treeList:
+                child = self.tree.AppendItem(root, item[0])
+                if not firstChild: firstChild = child
+                for childItem in item[1]:
+                    theDemo = self.tree.AppendItem(child, childItem)
+                    self.treeMap[childItem] = theDemo
+
+            self.tree.Expand(root)
+            self.tree.Expand(firstChild)
+            EVT_TREE_ITEM_EXPANDED   (self.tree, tID, self.OnItemExpanded)
+            EVT_TREE_ITEM_COLLAPSED  (self.tree, tID, self.OnItemCollapsed)
+            EVT_TREE_SEL_CHANGED     (self.tree, tID, self.OnSelChanged)

 
         # Create a Notebook
 
         # Create a Notebook

-        self.nb = wxNotebook(splitter2, -1)
+        self.nb = wxNotebook(nbParent, -1)

 
         # Set up a TextCtrl on the Overview Notebook page
         self.ovr = wxTextCtrl(self.nb, -1, style = wxTE_MULTILINE|wxTE_READONLY)
 
         # Set up a TextCtrl on the Overview Notebook page
         self.ovr = wxTextCtrl(self.nb, -1, style = wxTE_MULTILINE|wxTE_READONLY)


@@ -130,46 +168,58 @@ class wxPythonDemo(wxFrame):
 
 
         # Set up a log on the View Log Notebook page
 
 
         # Set up a log on the View Log Notebook page

-        self.log = wxTextCtrl(splitter2, -1,
+        self.log = wxTextCtrl(logParent, -1,

                               style = wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL)
         (w, self.charHeight) = self.log.GetTextExtent('X')
                               style = wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL)
         (w, self.charHeight) = self.log.GetTextExtent('X')

-        #self.WriteText('wxPython Demo Log:\n')
+        self.WriteText('wxPython Demo Log:\n')

 
 

+        self.Show(true)

 
         # add the windows to the splitter and split it.
 
         # add the windows to the splitter and split it.

-        splitter.SplitVertically(self.tree, splitter2)
-        splitter.SetSashPosition(180, true)
-        splitter.SetMinimumPaneSize(20)
+        if _useSplitter:
+            if _useNestedSplitter:
+                splitter2.SplitHorizontally(self.nb, self.log)
+                splitter2.SetSashPosition(360, true)
+                splitter2.SetMinimumPaneSize(20)
+
+                splitter.SplitVertically(self.tree, splitter2)
+            else:
+                splitter.SplitVertically(self.tree, self.nb)
+
+            splitter.SetSashPosition(180, true)
+            splitter.SetMinimumPaneSize(20)

 
 

-        splitter2.SplitHorizontally(self.nb, self.log)
-        splitter2.SetSashPosition(360, true)
-        splitter2.SetMinimumPaneSize(20)

 
         # make our log window be stdout
         #sys.stdout = self
 
         # select initial items
         self.nb.SetSelection(0)
 
         # make our log window be stdout
         #sys.stdout = self
 
         # select initial items
         self.nb.SetSelection(0)

-        self.tree.SelectItem(root)
+        if _useSplitter:
+            self.tree.SelectItem(root)

 
         if len(sys.argv) == 2:
             try:
                 selectedDemo = self.treeMap[sys.argv[1]]
             except:
                 selectedDemo = None
 
         if len(sys.argv) == 2:
             try:
                 selectedDemo = self.treeMap[sys.argv[1]]
             except:
                 selectedDemo = None

-            if selectedDemo:
+            if selectedDemo and _useSplitter:

                 self.tree.SelectItem(selectedDemo)
                 self.tree.EnsureVisible(selectedDemo)
 
 
                 self.tree.SelectItem(selectedDemo)
                 self.tree.EnsureVisible(selectedDemo)
 
 

+        self.WriteText('window handle: %s\n' % self.GetHandle())
+
+

     #---------------------------------------------
     def WriteText(self, text):
         self.log.WriteText(text)
         w, h = self.log.GetClientSizeTuple()
         numLines = h/self.charHeight
         x, y = self.log.PositionToXY(self.log.GetLastPosition())
     #---------------------------------------------
     def WriteText(self, text):
         self.log.WriteText(text)
         w, h = self.log.GetClientSizeTuple()
         numLines = h/self.charHeight
         x, y = self.log.PositionToXY(self.log.GetLastPosition())

-        self.log.ShowPosition(self.log.XYToPosition(x, y-numLines))
-        ##self.log.ShowPosition(self.log.GetLastPosition())
+        if y > numLines:
+            self.log.ShowPosition(self.log.XYToPosition(x, y-numLines))
+            ##self.log.ShowPosition(self.log.GetLastPosition())

         self.log.SetInsertionPointEnd()
 
     def write(self, txt):
         self.log.SetInsertionPointEnd()
 
     def write(self, txt):


@@ -190,27 +240,32 @@ class wxPythonDemo(wxFrame):
         if self.dying:
             return
 
         if self.dying:
             return
 

+        item = event.GetItem()
+        itemText = self.tree.GetItemText(item)
+        self.RunDemo(itemText)
+
+
+    #---------------------------------------------
+    def RunDemo(self, itemText):
+        os.chdir(self.cwd)

         if self.nb.GetPageCount() == 3:
             if self.nb.GetSelection() == 2:
                 self.nb.SetSelection(0)
             self.nb.DeletePage(2)
 
         if self.nb.GetPageCount() == 3:
             if self.nb.GetSelection() == 2:
                 self.nb.SetSelection(0)
             self.nb.DeletePage(2)
 

-        item = event.GetItem()
-        itemText = self.tree.GetItemText(item)
-

         if itemText == 'Overview':
             self.GetDemoFile('Main.py')
             self.SetOverview('Overview', overview)
         if itemText == 'Overview':
             self.GetDemoFile('Main.py')
             self.SetOverview('Overview', overview)

-            #self.nb.ResizeChildren();

             self.nb.Refresh();
             self.nb.Refresh();

-            #wxYield()

             self.window = None
 
         else:
             if os.path.exists(itemText + '.py'):
             self.window = None
 
         else:
             if os.path.exists(itemText + '.py'):

+                wxBeginBusyCursor()

                 self.GetDemoFile(itemText + '.py')
                 module = __import__(itemText, globals())
                 self.SetOverview(itemText, module.overview)
                 self.GetDemoFile(itemText + '.py')
                 module = __import__(itemText, globals())
                 self.SetOverview(itemText, module.overview)

+                wxEndBusyCursor()

 
                 # in case runTest is modal, make sure things look right...
                 self.nb.Refresh();
 
                 # in case runTest is modal, make sure things look right...
                 self.nb.Refresh();


@@ -219,8 +274,11 @@ class wxPythonDemo(wxFrame):
                 self.window = module.runTest(self, self.nb, self)
                 if self.window:
                     self.nb.AddPage(self.window, 'Demo')
                 self.window = module.runTest(self, self.nb, self)
                 if self.window:
                     self.nb.AddPage(self.window, 'Demo')

+                    #self.nb.ResizeChildren()

                     self.nb.SetSelection(2)
                     self.nb.SetSelection(2)

-                    self.nb.ResizeChildren();
+                    #self.nb.ResizeChildren()
+                    #if self.window.GetAutoLayout():
+                    #    self.window.Layout()

 
             else:
                 self.ovr.Clear()
 
             else:
                 self.ovr.Clear()


@@ -228,6 +286,7 @@ class wxPythonDemo(wxFrame):
                 self.window = None
 
 
                 self.window = None
 
 

+

     #---------------------------------------------
     # Get the Demo files
     def GetDemoFile(self, filename):
     #---------------------------------------------
     # Get the Demo files
     def GetDemoFile(self, filename):


@@ -265,6 +324,7 @@ class wxPythonDemo(wxFrame):
         #                        "of wxPython.\n\n"
         #                        "          Developed by Robin Dunn",
         #                       "About wxPython", wxOK)
         #                        "of wxPython.\n\n"
         #                        "          Developed by Robin Dunn",
         #                       "About wxPython", wxOK)

+        from About import MyAboutBox

         about = MyAboutBox(self)
         about.ShowModal()
         about.Destroy()
         about = MyAboutBox(self)
         about.ShowModal()
         about.Destroy()


@@ -274,6 +334,7 @@ class wxPythonDemo(wxFrame):
     def OnCloseWindow(self, event):
         self.dying = true
         self.window = None
     def OnCloseWindow(self, event):
         self.dying = true
         self.window = None

+        self.mainmenu = None

         self.Destroy()
 
     #---------------------------------------------
         self.Destroy()
 
     #---------------------------------------------


@@ -285,54 +346,16 @@ class wxPythonDemo(wxFrame):
 
     #---------------------------------------------
     def OnDemoMenu(self, event):
 
     #---------------------------------------------
     def OnDemoMenu(self, event):

-        print event.GetId(), self.mainmenu.GetLabel(event.GetId())
-        try:
-            selectedDemo = self.treeMap[self.mainmenu.GetLabel(event.GetId())]
-        except:
-            selectedDemo = None
-        if selectedDemo:
-            self.tree.SelectItem(selectedDemo)
-            self.tree.EnsureVisible(selectedDemo)
-
-
-
-#---------------------------------------------------------------------------
-#---------------------------------------------------------------------------
-
-class MyAboutBox(wxDialog):
-    text = '''
-<html>
-<body bgcolor="#AC76DE">
-<center><table bgcolor="#458154" width="100%%" cellspacing="0" cellpadding="0" border="1">
-<tr>
-    <td align="center"><h1>wxPython %s</h1></td>
-</tr>
-</table>
-
-<p><b>wxPython</b> is a Python extension module that
-encapsulates the wxWindows GUI classes.</p>
-
-<p>This demo shows off some of the capabilities
-of <b>wxPython</b>.  Select items from the menu or tree control,
-sit back and enjoy.  Be sure to take a peek at the source code for each
-demo item so you can learn how to use the classes yourself.</p>
-
-<p><b>wxPython</b> is brought to you by <b>Robin Dunn</b> and<br>
-<b>Total Control Software</b>, copyright 1999.</p>
-
-<p><font size="-1">Please see <i>license.txt</i> for licensing information.</font></p>
-</center>
-</body>
-</html>
-'''
-    def __init__(self, parent):
-        from wxPython.html import *
-        wxDialog.__init__(self, parent, -1, 'About wxPython')
-        self.html = wxHtmlWindow(self, -1, wxPoint(5,5), wxSize(400, 350))
-        self.html.SetPage(self.text % wx.__version__)
-        wxButton(self, wxID_OK, 'OK', wxPoint(5, 365)).SetDefault()
-        self.Fit()
-
+        if _useSplitter:
+            try:
+                selectedDemo = self.treeMap[self.mainmenu.GetLabel(event.GetId())]
+            except:
+                selectedDemo = None
+            if selectedDemo:
+                self.tree.SelectItem(selectedDemo)
+                self.tree.EnsureVisible(selectedDemo)
+        else:
+            self.RunDemo(self.mainmenu.GetLabel(event.GetId()))

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


@@ -342,7 +365,16 @@ class MyApp(wxApp):
         wxImage_AddHandler(wxJPEGHandler())
         wxImage_AddHandler(wxPNGHandler())
         wxImage_AddHandler(wxGIFHandler())
         wxImage_AddHandler(wxJPEGHandler())
         wxImage_AddHandler(wxPNGHandler())
         wxImage_AddHandler(wxGIFHandler())

-        frame = wxPythonDemo(NULL, -1, "wxPython: (A Demonstration)")
+
+        self.splash = SplashScreen(None, bitmapfile='bitmaps/splash.gif',
+                              duration=4000, callback=self.AfterSplash)
+        self.splash.Show(true)
+        wxYield()
+        return true
+
+    def AfterSplash(self):
+        self.splash.Close(true)
+        frame = wxPythonDemo(None, -1, "wxPython: (A Demonstration)")

         frame.Show(true)
         self.SetTopWindow(frame)
         return true
         frame.Show(true)
         self.SetTopWindow(frame)
         return true