From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 24 Sep 2008 13:33:06 +0000 (+0000)
Subject: restore the original selection when the dropdown is cancelled even if it was -1;... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/13139e93005cedec484b1e97e08b649a2196327a

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
---

diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp
index 7b73e6f6f1..14a10703bc 100644
--- a/src/msw/choice.cpp
+++ b/src/msw/choice.cpp
@@ -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: