From: Robin Dunn <robin@alldunn.com>
Date: Wed, 18 May 2005 18:03:29 +0000 (+0000)
Subject: Bug fix from Chad Netzer for when self.history is None
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2c3e35c2fcd636a3c9a280e19feb47dc5eb053ae

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 b678473a24..b64dc29e53 100644
--- 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 c731be2b6e..ca3338f462 100644
--- 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):