From 6bb45751e574984b1300141bdb29ec29e6f3e8ec Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 17 Feb 2018 14:17:13 +0100 Subject: [PATCH] Remove redundant ShouldForwardFromEditToCombo() check No real changes, just avoid calling ShouldForwardFromEditToCombo() in MSWProcessEditMsg() because this function is only called when the message should be forwarded. Also make the comment about the return value more clear. --- src/msw/combobox.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp index 87dcc61b3e1c..45c9be0ffd34 100644 --- a/src/msw/combobox.cpp +++ b/src/msw/combobox.cpp @@ -277,15 +277,10 @@ bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam) break; } - if ( ShouldForwardFromEditToCombo(msg) ) - { - // For all the messages forward from the edit control the - // result is not used. - WXLRESULT result; - return MSWHandleMessage(&result, msg, wParam, lParam); - } - - return false; + // For all the messages forwarded from the edit control the result is not + // used and 0 must be returned if the message is handled. + WXLRESULT result; + return MSWHandleMessage(&result, msg, wParam, lParam); } bool wxComboBox::MSWCommand(WXUINT param, WXWORD id)