fixed LastRead() after Read(wxOutputStream&) (patch 1658301)

[wxWidgets.git] / src / msw / combobox.cpp

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 2f3f338f46b432981075b7d92b55478910e75631..2283515d56bd1e3efdbf486f2f60b45375363a1d 100644 (file)
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -263,6 +263,9 @@ bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam)
             // when Enter is pressed
             if ( wParam == VK_RETURN )
             {
             // when Enter is pressed
             if ( wParam == VK_RETURN )
             {

+                if (SendMessage(GetHwnd(), CB_GETDROPPEDSTATE, 0, 0))
+                    return false;
+            

                 wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
 
                 const int sel = GetSelection();
                 wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
 
                 const int sel = GetSelection();


@@ -361,7 +364,7 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD id)
 
     // skip wxChoice version as it would generate its own events for
     // CBN_SELENDOK
 
     // skip wxChoice version as it would generate its own events for
     // CBN_SELENDOK

-    return wxControl::MSWCommand(param, id);
+    return true;

 }
 
 WXHWND wxComboBox::GetEditHWND() const
 }
 
 WXHWND wxComboBox::GetEditHWND() const