restore the original selection when the dropdown is cancelled even if it was -1; this fixes the problem of #9995 and the existing code didn't deal correctly with the problem of losing current text in the combobox when the dropdown was cancelled anyhow

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-09-24 13:33:06 +00:00
parent e57337cec3
commit 13139e9300

View File

@@ -703,13 +703,6 @@ bool wxChoice::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
// need to reset the selection back to it if it's eventually
// cancelled by user
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;
case CBN_CLOSEUP: