Fix for Bug #229543
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -64,6 +64,8 @@ class FileBrowseButton(wxPanel):
|
|||||||
self.fileMask = fileMask
|
self.fileMask = fileMask
|
||||||
self.fileMode = fileMode
|
self.fileMode = fileMode
|
||||||
self.changeCallback = changeCallback
|
self.changeCallback = changeCallback
|
||||||
|
self.callCallback = true
|
||||||
|
|
||||||
|
|
||||||
# get background to match it
|
# get background to match it
|
||||||
try:
|
try:
|
||||||
@@ -127,10 +129,14 @@ class FileBrowseButton(wxPanel):
|
|||||||
textControl = wxTextCtrl(self, ID)
|
textControl = wxTextCtrl(self, ID)
|
||||||
textControl.SetToolTipString( self.toolTip )
|
textControl.SetToolTipString( self.toolTip )
|
||||||
if self.changeCallback:
|
if self.changeCallback:
|
||||||
EVT_TEXT(textControl, ID, self.changeCallback)
|
EVT_TEXT(textControl, ID, self.OnChanged)
|
||||||
EVT_COMBOBOX(textControl, ID, self.changeCallback)
|
EVT_COMBOBOX(textControl, ID, self.OnChanged)
|
||||||
return textControl
|
return textControl
|
||||||
|
|
||||||
|
def OnChanged(self, evt):
|
||||||
|
if self.callCallback:
|
||||||
|
self.changeCallback(evt)
|
||||||
|
|
||||||
def createBrowseButton( self):
|
def createBrowseButton( self):
|
||||||
"""Create the browse-button control"""
|
"""Create the browse-button control"""
|
||||||
ID = wxNewId()
|
ID = wxNewId()
|
||||||
@@ -166,8 +172,11 @@ class FileBrowseButton(wxPanel):
|
|||||||
|
|
||||||
def SetValue (self, value, callBack=1):
|
def SetValue (self, value, callBack=1):
|
||||||
""" Convenient setting of text control value """
|
""" Convenient setting of text control value """
|
||||||
# Removed the return from here because SetValue doesn't return anything.
|
save = self.callCallback
|
||||||
self.textControl.SetValue (value)
|
self.callCallback = callBack
|
||||||
|
self.textControl.SetValue(value)
|
||||||
|
self.callCallback = save
|
||||||
|
|
||||||
|
|
||||||
def Enable (self, value):
|
def Enable (self, value):
|
||||||
""" Convenient enabling/disabling of entire control """
|
""" Convenient enabling/disabling of entire control """
|
||||||
@@ -282,8 +291,11 @@ class FileBrowseButtonWithHistory( FileBrowseButton ):
|
|||||||
def SetValue (self, value, callBack=1):
|
def SetValue (self, value, callBack=1):
|
||||||
""" Convenient setting of text control value, works
|
""" Convenient setting of text control value, works
|
||||||
around limitation of wxComboBox """
|
around limitation of wxComboBox """
|
||||||
# Removed the return from here because SetValue doesn't return anything.
|
save = self.callCallback
|
||||||
self.textControl.SetValue (value)
|
self.callCallback = callBack
|
||||||
|
self.textControl.SetValue(value)
|
||||||
|
self.callCallback = save
|
||||||
|
|
||||||
# Hack to call an event handler
|
# Hack to call an event handler
|
||||||
class LocalEvent:
|
class LocalEvent:
|
||||||
def __init__(self, string):
|
def __init__(self, string):
|
||||||
|
Reference in New Issue
Block a user