adapted to new font setter

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

diff --git a/wxPython/demo/FileBrowseButton.py b/wxPython/demo/FileBrowseButton.py
index 980bc689f65ef08970af251c1cf13e7af10621a7..2af110a9f8eb81d9b63fd429f0acf1c64cc43d07 100644 (file)
--- a/wxPython/demo/FileBrowseButton.py
+++ b/wxPython/demo/FileBrowseButton.py
@@ -16,18 +16,27 @@ class TestPanel(wx.Panel):
         self.log = log
 
         self.fbb = filebrowse.FileBrowseButton(
         self.log = log
 
         self.fbb = filebrowse.FileBrowseButton(

-            self, -1, (20, 20), (450, -1), changeCallback = self.fbbCallback
+            self, -1, size=(450, -1), changeCallback = self.fbbCallback

             )
 
         self.fbbh = filebrowse.FileBrowseButtonWithHistory(
             )
 
         self.fbbh = filebrowse.FileBrowseButtonWithHistory(

-            self, -1, (20, 50), (450, -1),  changeCallback = self.fbbhCallback
+            self, -1, size=(450, -1),  changeCallback = self.fbbhCallback

             )
             )

-
+            

         self.dbb = filebrowse.DirBrowseButton(
         self.dbb = filebrowse.DirBrowseButton(

-            self, -1, (20, 80), (450, -1), changeCallback = self.dbbCallback
+            self, -1, size=(450, -1), changeCallback = self.dbbCallback

             )
 
             )
 

-        self.fbbh.SetHistory(['You', 'can', 'put', 'some', 'file', 'names', 'here'])
+        self.fbbh.callCallback = False
+        self.fbbh.SetHistory(['You', 'can', 'put', 'some', 'filenames', 'here'], 4)
+
+        sizer = wx.BoxSizer(wx.VERTICAL)
+        sizer.Add(self.fbb, 0, wx.ALL, 5)
+        sizer.Add(self.fbbh, 0, wx.ALL, 5)
+        sizer.Add(self.dbb, 0, wx.ALL, 5)
+        box = wx.BoxSizer()
+        box.Add(sizer, 0, wx.ALL, 20)
+        self.SetSizer(box)

 
 
     def fbbCallback(self, evt):
 
 
     def fbbCallback(self, evt):


@@ -37,10 +46,14 @@ class TestPanel(wx.Panel):
     def fbbhCallback(self, evt):
         if hasattr(self, 'fbbh'):
             value = evt.GetString()
     def fbbhCallback(self, evt):
         if hasattr(self, 'fbbh'):
             value = evt.GetString()

+            if not value:
+                return

             self.log.write('FileBrowseButtonWithHistory: %s\n' % value)
             history = self.fbbh.GetHistory()
             self.log.write('FileBrowseButtonWithHistory: %s\n' % value)
             history = self.fbbh.GetHistory()

-            history.append(value)
-            self.fbbh.SetHistory(history)
+            if value not in history:
+                history.append(value)
+                self.fbbh.SetHistory(history)
+                self.fbbh.GetHistoryControl().SetStringSelection(value)

 
 
     def dbbCallback(self, evt):
 
 
     def dbbCallback(self, evt):