keep m_value in sync with real combobox value (set it initially and update it correct...

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

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 0967e6e57442e254735f2e320b5c0ca9d03af605..5cd1e71bed94facc7bc128298967beb30d321eb8 100644 (file)
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -341,7 +341,7 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
                 // want the new one)
                 if ( sel == -1 )
                 {
                 // want the new one)
                 if ( sel == -1 )
                 {

-                    m_value = GetValue();
+                    m_value = wxGetWindowText(GetHwnd());

                 }
                 else // we're synthesizing text updated event from sel change
                 {
                 }
                 else // we're synthesizing text updated event from sel change
                 {


@@ -481,6 +481,7 @@ void wxComboBox::SetValue(const wxString& value)
     else
         SetWindowText(GetHwnd(), value.c_str());
 
     else
         SetWindowText(GetHwnd(), value.c_str());
 

+    m_value = value;

     m_selectionOld = GetSelection();
 }
 
     m_selectionOld = GetSelection();
 }