X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/916eecaad6d0840cc8ec10f4fa2aa3d29322e3b3..68f146206ff65cfafdf88c154aece854a0ba4864:/src/msw/combobox.cpp

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 2f3f338f46..2283515d56 100644
--- 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 )
             {
+                if (SendMessage(GetHwnd(), CB_GETDROPPEDSTATE, 0, 0))
+                    return false;
+            
                 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
-    return wxControl::MSWCommand(param, id);
+    return true;
 }
 
 WXHWND wxComboBox::GetEditHWND() const