Added wxTopLevelWindow::HasFocus() as discussed.

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

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index cae2caec0bbcfe60ea93e0812675d87942cd06cb..96a8c8eb2716dee5815536497e985b1f99c0bba1 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -47,8 +47,9 @@ import images
 _treeList = [
     # new stuff
     ('Recent Additions/Updates', [
 _treeList = [
     # new stuff
     ('Recent Additions/Updates', [

-        'OGL',
-        'FloatCanvas',
+        'StockButtons',
+        'Ticker',
+        'Choicebook',

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


@@ -65,7 +66,6 @@ _treeList = [
         'ColourDialog',
         'DirDialog',
         'FileDialog',
         'ColourDialog',
         'DirDialog',
         'FileDialog',

-        'FileDialog_Save',

         'FindReplaceDialog',
         'FontDialog',
         'MessageDialog',
         'FindReplaceDialog',
         'FontDialog',
         'MessageDialog',


@@ -90,6 +90,7 @@ _treeList = [
         'CheckBox',
         'CheckListBox',
         'Choice',
         'CheckBox',
         'CheckListBox',
         'Choice',

+        'Choicebook',

         'ComboBox',
         'Gauge',
         'Grid',
         'ComboBox',
         'Gauge',
         'Grid',


@@ -113,6 +114,7 @@ _treeList = [
         'StaticBitmap',
         'StaticText',
         'StatusBar',
         'StaticBitmap',
         'StaticText',
         'StatusBar',

+        'StockButtons',

         'TextCtrl',
         'ToggleButton',
         'ToolBar',
         'TextCtrl',
         'ToggleButton',
         'ToolBar',


@@ -163,6 +165,7 @@ _treeList = [
         'StyledTextCtrl_2',
         'TablePrint',
         'Throbber',
         'StyledTextCtrl_2',
         'TablePrint',
         'Throbber',

+        'Ticker',

         'TimeCtrl',
         'VListBox',
         ]),
         'TimeCtrl',
         'VListBox',
         ]),


@@ -189,7 +192,7 @@ _treeList = [
         'PythonEvents',
         'Threads',
         'Timer',
         'PythonEvents',
         'Threads',
         'Timer',

-        'infoframe',
+        ##'infoframe',    # needs better explaination and some fixing

         ]),
 
     # Clipboard and DnD
         ]),
 
     # Clipboard and DnD


@@ -214,7 +217,7 @@ _treeList = [
     # Other stuff
     ('Miscellaneous', [
         'ColourDB',
     # Other stuff
     ('Miscellaneous', [
         'ColourDB',

-        'DialogUnits',
+        ##'DialogUnits',   # needs more explainations

         'DrawXXXList',
         'FileHistory',
         'FontEnumerator',
         'DrawXXXList',
         'FileHistory',
         'FontEnumerator',


@@ -274,7 +277,7 @@ try:
 
     class DemoCodeEditor(PythonSTC):
         def __init__(self, parent):
 
     class DemoCodeEditor(PythonSTC):
         def __init__(self, parent):

-            PythonSTC.__init__(self, parent, -1, wx.BORDER_NONE)
+            PythonSTC.__init__(self, parent, -1, style=wx.BORDER_NONE)

             self.SetUpEditor()
 
         # Some methods to make it compatible with how the wxTextCtrl is used
             self.SetUpEditor()
 
         # Some methods to make it compatible with how the wxTextCtrl is used


@@ -444,8 +447,8 @@ try:
 except ImportError:
     class DemoCodeEditor(wx.TextCtrl):
         def __init__(self, parent):
 except ImportError:
     class DemoCodeEditor(wx.TextCtrl):
         def __init__(self, parent):

-            wx.TextCtrl.__init__(self, parent, -1, style = wx.TE_MULTILINE | 
-                                 wx.HSCROLL | wx.TE_RICH2 | wx.TE_NOHIDESEL)
+            wx.TextCtrl.__init__(self, parent, -1, style =
+                                 wx.TE_MULTILINE | wx.HSCROLL | wx.TE_RICH2 | wx.TE_NOHIDESEL)

 
         def RegisterModifiedEvent(self, eventHandler):
             self.Bind(wx.EVT_TEXT, eventHandler)
 
         def RegisterModifiedEvent(self, eventHandler):
             self.Bind(wx.EVT_TEXT, eventHandler)


@@ -483,7 +486,9 @@ modDefault = modOriginal
 class DemoCodePanel(wx.Panel):
     """Panel for the 'Demo Code' tab"""
     def __init__(self, parent, mainFrame):
 class DemoCodePanel(wx.Panel):
     """Panel for the 'Demo Code' tab"""
     def __init__(self, parent, mainFrame):

-        wx.Panel.__init__(self, parent)
+        wx.Panel.__init__(self, parent, size=(1,1))
+        if 'wxMSW' in wx.PlatformInfo:
+            self.Hide()

         self.mainFrame = mainFrame
         self.editor = DemoCodeEditor(self)
         self.editor.RegisterModifiedEvent(self.OnCodeModified)
         self.mainFrame = mainFrame
         self.editor = DemoCodeEditor(self)
         self.editor.RegisterModifiedEvent(self.OnCodeModified)


@@ -531,6 +536,7 @@ class DemoCodePanel(wx.Panel):
     def ActiveModuleChanged(self):
         self.LoadDemoSource(self.demoModules.GetSource())
         self.UpdateControlState()
     def ActiveModuleChanged(self):
         self.LoadDemoSource(self.demoModules.GetSource())
         self.UpdateControlState()

+        self.ReloadDemo()

 
         
     def LoadDemoSource(self, source):
 
         
     def LoadDemoSource(self, source):


@@ -574,12 +580,11 @@ class DemoCodePanel(wx.Panel):
             busy = wx.BusyInfo("Reloading demo module...")
             self.demoModules.SetActive(modSelected)
             self.ActiveModuleChanged()
             busy = wx.BusyInfo("Reloading demo module...")
             self.demoModules.SetActive(modSelected)
             self.ActiveModuleChanged()

-            self.ReloadDemo()

 
 
     def ReloadDemo(self):
         if self.demoModules.name != __name__:
 
 
     def ReloadDemo(self):
         if self.demoModules.name != __name__:

-            self.mainFrame.RunModule(False)
+            self.mainFrame.RunModule()

 
                 
     def OnCodeModified(self, event):
 
                 
     def OnCodeModified(self, event):


@@ -625,7 +630,6 @@ class DemoCodePanel(wx.Panel):
         busy = wx.BusyInfo("Reloading demo module...")
         self.demoModules.LoadFromFile(modModified, modifiedFilename)
         self.ActiveModuleChanged()
         busy = wx.BusyInfo("Reloading demo module...")
         self.demoModules.LoadFromFile(modModified, modifiedFilename)
         self.ActiveModuleChanged()

-        self.ReloadDemo()

 
 
     def OnRestore(self, event): # Handles the "Delete Modified" button
 
 
     def OnRestore(self, event): # Handles the "Delete Modified" button


@@ -634,7 +638,6 @@ class DemoCodePanel(wx.Panel):
         os.unlink(modifiedFilename) # Delete the modified copy
         busy = wx.BusyInfo("Reloading demo module...")
         self.ActiveModuleChanged()
         os.unlink(modifiedFilename) # Delete the modified copy
         busy = wx.BusyInfo("Reloading demo module...")
         self.ActiveModuleChanged()

-        self.ReloadDemo()

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


@@ -716,8 +719,6 @@ class DemoModules:
         # load modified module (if one exists)
         if DoesModifiedExist(name):
            self.LoadFromFile(modModified, GetModifiedFilename(name))
         # load modified module (if one exists)
         if DoesModifiedExist(name):
            self.LoadFromFile(modModified, GetModifiedFilename(name))

-           if (modDefault == modModified):
-               self.SetActive(modModified)

 
 
     def LoadFromFile(self, modID, filename):
 
 
     def LoadFromFile(self, modID, filename):


@@ -814,35 +815,6 @@ class DemoModules:
         self.modules[modID][2] = ""
 
 
         self.modules[modID][2] = ""
 
 

-#---------------------------------------------------------------------------
-class ReloadDemoPanel(wx.Panel):
-    """
-    Panel put into the demo tab when the demo just shows some
-    top-level window.  Enables the demo to be reloaded after being
-    closed.
-    """
-
-    infoText = "This demo runs outside the main window"
-    
-    def __init__(self, parent, codePanel, log):
-        wx.Panel.__init__(self, parent, -1)
-        self.codePanel = codePanel
-        self.log = log
-
-        self.label = wx.StaticText(self, -1, self.infoText)
-        self.btnReload = wx.Button(self, -1, "Reload Demo")
-        self.btnReload.Bind(wx.EVT_BUTTON, self.OnReload)
-
-        self.box = wx.BoxSizer(wx.VERTICAL)
-        self.box.Add(self.label, 0, wx.ALIGN_CENTER | wx.ALL, 10)
-        self.box.Add(self.btnReload, 0, wx.ALIGN_CENTER | wx.ALL, 10)
-
-        self.box.Fit(self)
-        self.SetSizer(self.box)
-        
-    def OnReload(self, event):
-        self.codePanel.ReloadDemo()
-

 #---------------------------------------------------------------------------
 
 class DemoError:
 #---------------------------------------------------------------------------
 
 class DemoError:


@@ -989,8 +961,8 @@ class wxPythonDemo(wx.Frame):
         self.curOverview = ""
         self.demoPage = None
         self.codePage = None
         self.curOverview = ""
         self.demoPage = None
         self.codePage = None

-        self.useModified = False

         self.shell = None
         self.shell = None

+        self.firstTime = True

 
         icon = images.getMondrianIcon()
         self.SetIcon(icon)
 
         icon = images.getMondrianIcon()
         self.SetIcon(icon)


@@ -1150,7 +1122,7 @@ class wxPythonDemo(wx.Frame):
             panel.Bind(wx.EVT_ERASE_BACKGROUND, EmptyHandler)
 
         if "gtk2" in wx.PlatformInfo:
             panel.Bind(wx.EVT_ERASE_BACKGROUND, EmptyHandler)
 
         if "gtk2" in wx.PlatformInfo:

-            self.ovr.NormalizeFontSizes()
+            self.ovr.SetStandardFonts()

         self.SetOverview(self.overviewText, mainOverview)
 
 
         self.SetOverview(self.overviewText, mainOverview)
 
 


@@ -1263,7 +1235,7 @@ class wxPythonDemo(wx.Frame):
                 if os.path.exists(GetOriginalFilename(demoName)):
                     wx.LogMessage("Loading demo %s.py..." % demoName)
                     self.demoModules = DemoModules(demoName)
                 if os.path.exists(GetOriginalFilename(demoName)):
                     wx.LogMessage("Loading demo %s.py..." % demoName)
                     self.demoModules = DemoModules(demoName)

-                    self.RunModule(True)
+                    self.LoadDemoSource()

                     self.tree.Refresh()
                 else:
                     self.SetOverview("wxPython", mainOverview)
                     self.tree.Refresh()
                 else:
                     self.SetOverview("wxPython", mainOverview)


@@ -1279,7 +1251,7 @@ class wxPythonDemo(wx.Frame):
         self.codePage.LoadDemo(self.demoModules)
         
     #---------------------------------------------
         self.codePage.LoadDemo(self.demoModules)
         
     #---------------------------------------------

-    def RunModule(self, loadSource):
+    def RunModule(self):

         """Runs the active module"""
 
         module = self.demoModules.GetActive()
         """Runs the active module"""
 
         module = self.demoModules.GetActive()


@@ -1298,20 +1270,26 @@ class wxPythonDemo(wx.Frame):
 
             try:
                 self.demoPage = module.runTest(self, self.nb, self)
 
             try:
                 self.demoPage = module.runTest(self, self.nb, self)

-                if self.demoPage is None:
-                    self.demoPage = ReloadDemoPanel(self.nb, self.codePage, self)

             except:
                 self.demoPage = DemoErrorPanel(self.nb, self.codePage,
             except:
                 self.demoPage = DemoErrorPanel(self.nb, self.codePage,

-                                               DemoError(sys.exc_info()), self)                
+                                               DemoError(sys.exc_info()), self)
+
+            assert self.demoPage is not None, "runTest must return a window!"
+            

         else:
             # There was a previous error in compiling or exec-ing
             self.demoPage = DemoErrorPanel(self.nb, self.codePage,
                                            self.demoModules.GetErrorInfo(), self)
         else:
             # There was a previous error in compiling or exec-ing
             self.demoPage = DemoErrorPanel(self.nb, self.codePage,
                                            self.demoModules.GetErrorInfo(), self)

-
-        if loadSource:
-            self.LoadDemoSource()
+            

         self.SetOverview(self.demoModules.name + " Overview", overviewText)
         self.SetOverview(self.demoModules.name + " Overview", overviewText)

-        self.UpdateNotebook()
+
+        if self.firstTime:
+            # cahnge to the demo page the first time a module is run
+            self.UpdateNotebook(2)
+            self.firstTime = False
+        else:
+            # otherwise just stay on the same tab in case the user has changed to another one
+            self.UpdateNotebook()

 
     #---------------------------------------------
     def ShutdownDemoModule(self):
 
     #---------------------------------------------
     def ShutdownDemoModule(self):