warning fix

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

diff --git a/wxPython/demo/FileBrowseButton.py b/wxPython/demo/FileBrowseButton.py
index 798f2012592055a4ec799cf51862bbb2cc140f10..369c245769672edbff9eddf47afdbefa329dfeb9 100644 (file)
--- a/wxPython/demo/FileBrowseButton.py
+++ b/wxPython/demo/FileBrowseButton.py
@@ -1,49 +1,62 @@
+

 """ Demonstrate filebrowsebutton module of the wxPython.lib Library.
 
 14.1.2001 Bernhard Reiter <bernhard@intevation.de>
     Added demo for DirBrowseButton and improved overview text.
 """
 """ Demonstrate filebrowsebutton module of the wxPython.lib Library.
 
 14.1.2001 Bernhard Reiter <bernhard@intevation.de>
     Added demo for DirBrowseButton and improved overview text.
 """

-from wxPython.wx import *
-from wxPython.lib.filebrowsebutton import FileBrowseButton, FileBrowseButtonWithHistory,DirBrowseButton

 
 

+import  wx
+import  wx.lib.filebrowsebutton as filebrowse

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

-class TestPanel(wxPanel):
+class TestPanel(wx.Panel):

     def __init__(self, parent, ID, log):
     def __init__(self, parent, ID, log):

-        wxPanel.__init__(self, parent, ID)
+        wx.Panel.__init__(self, parent, ID)

         self.log = log
         self.log = log

-        self.fbb = FileBrowseButton(self, -1, wxPoint(20,20), wxSize(450, -1),
-                                    changeCallback = self.fbbCallback)
-        self.fbbh = FileBrowseButtonWithHistory(self, -1, wxPoint(20, 50),
-                                                wxSize(450, -1),
-                                                #changeCallback = self.fbbhCallback
-                                                )
-        self.dbb = DirBrowseButton(self, -1, wxPoint(20,80), wxSize(450,-1),
-                                    changeCallback = self.dbbCallback)

 
 

+        self.fbb = filebrowse.FileBrowseButton(
+            self, -1, size=(450, -1), changeCallback = self.fbbCallback
+            )
+
+        self.fbbh = filebrowse.FileBrowseButtonWithHistory(
+            self, -1, size=(450, -1),  changeCallback = self.fbbhCallback
+            )
+            
+        self.dbb = filebrowse.DirBrowseButton(
+            self, -1, size=(450, -1), changeCallback = self.dbbCallback
+            )
+
+        self.fbbh.SetHistory(['You', 'can', 'put', 'some', 'filenames', 'here'])

 
 

-        self.fbbh.SetHistory(['You', 'can', 'put', 'some', 'file', 'names', 'here'])
+        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):
         self.log.write('FileBrowseButton: %s\n' % evt.GetString())
 
 
 
 
     def fbbCallback(self, evt):
         self.log.write('FileBrowseButton: %s\n' % evt.GetString())
 
 

-

     def fbbhCallback(self, evt):
         if hasattr(self, 'fbbh'):
             value = evt.GetString()
             self.log.write('FileBrowseButtonWithHistory: %s\n' % value)
             history = self.fbbh.GetHistory()
     def fbbhCallback(self, evt):
         if hasattr(self, 'fbbh'):
             value = evt.GetString()
             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):
         self.log.write('DirBrowseButton: %s\n' % evt.GetString())
 
 
 
     def dbbCallback(self, evt):
         self.log.write('DirBrowseButton: %s\n' % evt.GetString())
 
 

-

 #----------------------------------------------------------------------
 
 def runTest(frame, nb, log):
 #----------------------------------------------------------------------
 
 def runTest(frame, nb, log):


@@ -51,7 +64,6 @@ def runTest(frame, nb, log):
     return win
 
 
     return win
 
 

-

 #----------------------------------------------------------------------
 
 overview = """<html><body>
 #----------------------------------------------------------------------
 
 overview = """<html><body>


@@ -71,15 +83,14 @@ overview = """<html><body>
 </pre></small>
 
 </body><</html>
 </pre></small>
 
 </body><</html>

-""" % ( FileBrowseButton.__doc__,
-        FileBrowseButtonWithHistory.__doc__ ,
-        str(DirBrowseButton.__doc__) )
-
-
+""" % ( filebrowse.FileBrowseButton.__doc__,
+        filebrowse.FileBrowseButtonWithHistory.__doc__ , 
+        filebrowse.DirBrowseButton.__doc__
+        ) 

 
 
 if __name__ == '__main__':
     import sys,os
     import run
 
 
 if __name__ == '__main__':
     import sys,os
     import run

-    run.main(['', os.path.basename(sys.argv[0])])
+    run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])