From: Julian Smart <julian@anthemion.co.uk>
Date: Thu, 8 Jan 2004 14:59:57 +0000 (+0000)
Subject: Applied patch [ 873021 ] Bug fix for MSW wxComboBox
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/28764ac9d1941847d316b7969d6fa6fb87ce8584

Applied patch [ 873021 ] Bug fix for MSW wxComboBox
wxComboBox::GetValue within a wxEVT_COMMAND_TEXT_UPDATED event
should now pass the correct value even if the handler for
wxEVT_COMMAND_COMBOBOX_SELECTED changed the selection


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index a01a5d9d24..f71cb41a3f 100644
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -311,6 +311,14 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
                 }
                 else // we're synthesizing text updated event from sel change
                 {
+                    // We need to retrieve the current selection because the user
+                    // may have changed it in the previous handler (for CBN_SELCHANGE
+                    // above).
+                    sel = GetSelection();
+                    if ( sel > -1 )
+                    {
+                        value = GetString(sel);
+                    }
                     // 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