demo tweaks

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

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 6b978e229111467262c8d741c100c28a86806e03..25cd0792779d7badc9d2797fef7544a7dc225347 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -47,10 +47,8 @@ import images
 _treeList = [
     # new stuff
     ('Recent Additions/Updates', [
 _treeList = [
     # new stuff
     ('Recent Additions/Updates', [

-        'StandardPaths',
-        'MediaCtrl',
-        'DatePickerCtrl',
-        'MouseGestures',
+        'FoldPanelBar',
+        'GIFAnimationCtrl',

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


@@ -70,6 +68,7 @@ _treeList = [
         'FindReplaceDialog',
         'FontDialog',
         'MessageDialog',
         'FindReplaceDialog',
         'FontDialog',
         'MessageDialog',

+        'MultiChoiceDialog',

         'PageSetupDialog',
         'PrintDialog',
         'ProgressDialog',
         'PageSetupDialog',
         'PrintDialog',
         'ProgressDialog',


@@ -154,6 +153,8 @@ _treeList = [
         'FileBrowseButton',
         'FloatBar',  
         'FloatCanvas',
         'FileBrowseButton',
         'FloatBar',  
         'FloatCanvas',

+        'FoldPanelBar',
+        'GIFAnimationCtrl',

         'HtmlWindow',
         'IntCtrl',
         'MediaCtrl',
         'HtmlWindow',
         'IntCtrl',
         'MediaCtrl',


@@ -212,6 +213,7 @@ _treeList = [
         'ArtProvider',
         'Cursor',
         'DragImage',
         'ArtProvider',
         'Cursor',
         'DragImage',

+        'GIFAnimationCtrl',

         'Image',
         'ImageAlpha',
         'ImageFromStream',
         'Image',
         'ImageAlpha',
         'ImageFromStream',


@@ -1110,6 +1112,7 @@ class wxPythonDemo(wx.Frame):
         self.codePage = None
         self.shell = None
         self.firstTime = True
         self.codePage = None
         self.shell = None
         self.firstTime = True

+        self.finddlg = None

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


@@ -1196,9 +1199,11 @@ class wxPythonDemo(wx.Frame):
         self.Bind(wx.EVT_MENU, self.OnHelpAbout, helpItem)
         self.Bind(wx.EVT_MENU, self.OnHelpFind,  findItem)
         self.Bind(wx.EVT_MENU, self.OnFindNext,  findnextItem)
         self.Bind(wx.EVT_MENU, self.OnHelpAbout, helpItem)
         self.Bind(wx.EVT_MENU, self.OnHelpFind,  findItem)
         self.Bind(wx.EVT_MENU, self.OnFindNext,  findnextItem)

-        self.Bind(wx.EVT_COMMAND_FIND, self.OnFind)
-        self.Bind(wx.EVT_COMMAND_FIND_NEXT, self.OnFind)
-        self.Bind(wx.EVT_COMMAND_FIND_CLOSE, self.OnFindClose)
+        self.Bind(wx.EVT_FIND, self.OnFind)
+        self.Bind(wx.EVT_FIND_NEXT, self.OnFind)
+        self.Bind(wx.EVT_FIND_CLOSE, self.OnFindClose)
+        self.Bind(wx.EVT_UPDATE_UI, self.OnUpdateFindItems, findItem)
+        self.Bind(wx.EVT_UPDATE_UI, self.OnUpdateFindItems, findnextItem)

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


@@ -1515,6 +1520,9 @@ class wxPythonDemo(wx.Frame):
         about.Destroy()
 
     def OnHelpFind(self, event):
         about.Destroy()
 
     def OnHelpFind(self, event):

+        if self.finddlg != None:
+            return
+        

         self.nb.SetSelection(1)
         self.finddlg = wx.FindReplaceDialog(self, self.finddata, "Find",
                         wx.FR_NOUPDOWN |
         self.nb.SetSelection(1)
         self.finddlg = wx.FindReplaceDialog(self, self.finddata, "Find",
                         wx.FR_NOUPDOWN |


@@ -1522,6 +1530,11 @@ class wxPythonDemo(wx.Frame):
                         wx.FR_NOWHOLEWORD)
         self.finddlg.Show(True)
 
                         wx.FR_NOWHOLEWORD)
         self.finddlg.Show(True)
 

+
+    def OnUpdateFindItems(self, evt):
+        evt.Enable(self.finddlg == None)
+
+

     def OnFind(self, event):
         editor = self.codePage.editor
         self.nb.SetSelection(1)
     def OnFind(self, event):
         editor = self.codePage.editor
         self.nb.SetSelection(1)


@@ -1546,6 +1559,7 @@ class wxPythonDemo(wx.Frame):
                 return
             else:
                 self.finddlg.Destroy()
                 return
             else:
                 self.finddlg.Destroy()

+                self.finddlg = None

         editor.ShowPosition(loc)
         editor.SetSelection(loc, loc + len(findstring))
 
         editor.ShowPosition(loc)
         editor.SetSelection(loc, loc + len(findstring))
 


@@ -1559,6 +1573,7 @@ class wxPythonDemo(wx.Frame):
 
     def OnFindClose(self, event):
         event.GetDialog().Destroy()
 
     def OnFindClose(self, event):
         event.GetDialog().Destroy()

+        self.finddlg = None

 
 
     def OnOpenShellWindow(self, evt):
 
 
     def OnOpenShellWindow(self, evt):


@@ -1678,6 +1693,8 @@ class MyApp(wx.App):
         the main frame when it is time to do so.
         """
 
         the main frame when it is time to do so.
         """
 

+        wx.SystemOptions.SetOptionInt("mac.window-plain-transition", 1)
+

         # For debugging
         #self.SetAssertMode(wx.PYAPP_ASSERT_DIALOG)
 
         # For debugging
         #self.SetAssertMode(wx.PYAPP_ASSERT_DIALOG)