don't lose the combobox text when it's opened and closed (patch 1684252, closes bug 1612994)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -722,6 +722,13 @@ bool wxChoice::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
|
|||||||
// need to reset the selection back to it if it's eventually
|
// need to reset the selection back to it if it's eventually
|
||||||
// cancelled by user
|
// cancelled by user
|
||||||
m_lastAcceptedSelection = GetCurrentSelection();
|
m_lastAcceptedSelection = GetCurrentSelection();
|
||||||
|
if ( m_lastAcceptedSelection == -1 )
|
||||||
|
{
|
||||||
|
// no current selection so no need to restore it later (this
|
||||||
|
// happens when opening a combobox containing text not from its
|
||||||
|
// list of items and we shouldn't erase this text)
|
||||||
|
m_lastAcceptedSelection = wxID_NONE;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case CBN_CLOSEUP:
|
case CBN_CLOSEUP:
|
||||||
|
Reference in New Issue
Block a user