Merged modifications from the 2.6 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -242,8 +242,8 @@ class FileBrowseButtonWithHistory( FileBrowseButton ):
|
||||
textControl.SetToolTipString( self.toolTip )
|
||||
textControl.Bind(wx.EVT_SET_FOCUS, self.OnSetFocus)
|
||||
if self.changeCallback:
|
||||
textControl.Bind(wx.EVT_TEXT, self.changeCallback)
|
||||
textControl.Bind(wx.EVT_COMBOBOX, self.changeCallback)
|
||||
textControl.Bind(wx.EVT_TEXT, self.OnChanged)
|
||||
textControl.Bind(wx.EVT_COMBOBOX, self.OnChanged)
|
||||
if self.history:
|
||||
history=self.history
|
||||
self.history=None
|
||||
|
Reference in New Issue
Block a user