In wxComboPopupExtraEventHandler::OnMouseEvent(): Also include wxEVT_LEFT_UP among...

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

diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index c5304c88501b6cfc4d7c715e4fbb31e24f318b69..ac52ecc81ded2c111bcf38b071657ff520d2a983 100644 (file)
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -706,15 +706,15 @@ void wxComboPopupExtraEventHandler::OnMouseEvent( wxMouseEvent& event )
 
     event.Skip();
 
 
     event.Skip();
 

-    if ( evtType == wxEVT_MOTION ||
-         evtType == wxEVT_LEFT_DOWN ||
-         evtType == wxEVT_RIGHT_DOWN )
-    {
-        // Block motion and click events outside the popup
-        if ( !isInside || !m_combo->IsPopupShown() )
-        {
-            event.Skip(false);
-        }
+    // Block motion and click events outside the popup
+    if ( (!isInside || !m_combo->IsPopupShown())
+            &&
+         (evtType == wxEVT_MOTION ||
+          evtType == wxEVT_LEFT_DOWN ||
+          evtType == wxEVT_LEFT_UP ||
+          evtType == wxEVT_RIGHT_DOWN) )
+    {
+        event.Skip(false);

     }
     else if ( evtType == wxEVT_LEFT_UP )
     {
     }
     else if ( evtType == wxEVT_LEFT_UP )
     {