Bug fix from Chad Netzer for when self.history is None

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34143 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt
index b678473a24322b730b823de54679af58d80e5a2e..b64dc29e539669c2808ab1a5dca1114bde9e1989 100644 (file)
--- a/wxPython/docs/CHANGES.txt
+++ b/wxPython/docs/CHANGES.txt
@@ -84,7 +84,12 @@ wxSTC: Fixed CmdKeyAssign key bindings for Ctrl-Backspace.
 wxMSW: Fixed a bug in wx.TextCtrl where all the lines were being used
 to calculate the best size, instead of using a reasonable limit.
 
+XRCed: Use wx.GetDefaultPyEncoding/wx.SetDefaultPyEncoding for
+changing active encoding.  Fixed pasting siblings (Ctrl key pressed
+while pasting).
 
+wx.lib.filebrowsebutton: Bug fix from Chad Netzer for when
+self.history is None.
 
 
 

diff --git a/wxPython/wx/lib/filebrowsebutton.py b/wxPython/wx/lib/filebrowsebutton.py
index c731be2b6eab740ed636350506ed4d4e6805c93d..ca3338f462ee0b82c4c6339decdefd2da5934d35 100644 (file)
--- a/wxPython/wx/lib/filebrowsebutton.py
+++ b/wxPython/wx/lib/filebrowsebutton.py
@@ -289,8 +289,10 @@ class FileBrowseButtonWithHistory( FileBrowseButton ):
         """Return the current history list"""
         if self.historyCallBack != None:
             return self.historyCallBack()
-        else:
+        elif self.history:
             return list( self.history )
+        else:
+            return []
 
 
     def OnSetFocus(self, event):