fixed minor combobox bug: GetValue() reported wrong value when caleld from TEXT_UPDATED handler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -231,11 +231,22 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
|
|||||||
case CBN_EDITCHANGE:
|
case CBN_EDITCHANGE:
|
||||||
{
|
{
|
||||||
wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId());
|
wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId());
|
||||||
|
|
||||||
// if sel != -1, value was initialized above (and we can't use
|
// if sel != -1, value was initialized above (and we can't use
|
||||||
// GetValue() here as it would return the old selection and we
|
// GetValue() here as it would return the old selection and we
|
||||||
// want the new one)
|
// want the new one)
|
||||||
if ( sel == -1 )
|
if ( sel == -1 )
|
||||||
|
{
|
||||||
value = GetValue();
|
value = GetValue();
|
||||||
|
}
|
||||||
|
else // we're synthesizing text updated event from sel change
|
||||||
|
{
|
||||||
|
// we need to do this because the user code expects
|
||||||
|
// wxComboBox::GetValue() to return the new value from
|
||||||
|
// "text updated" handler but it hadn't been updated yet
|
||||||
|
SetValue(value);
|
||||||
|
}
|
||||||
|
|
||||||
event.SetString(value);
|
event.SetString(value);
|
||||||
event.SetEventObject(this);
|
event.SetEventObject(this);
|
||||||
ProcessCommand(event);
|
ProcessCommand(event);
|
||||||
|
Reference in New Issue
Block a user