In wxComboPopupExtraEventHandler::OnMouseEvent(): Also include wxEVT_LEFT_UP among the mouse events to be blocked when the cursor is outside the popup area. This fixes wxMSW bug where the popup disappears immediately after mouse button is released (see #12087).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64419 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli 2010-05-27 20:03:07 +00:00
parent 62b91200c7
commit eb7117d978

View File

@ -706,15 +706,15 @@ void wxComboPopupExtraEventHandler::OnMouseEvent( wxMouseEvent& event )
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())
&&
(evtType == wxEVT_MOTION ||
evtType == wxEVT_LEFT_DOWN ||
evtType == wxEVT_LEFT_UP ||
evtType == wxEVT_RIGHT_DOWN) )
{
// Block motion and click events outside the popup
if ( !isInside || !m_combo->IsPopupShown() )
{
event.Skip(false);
}
event.Skip(false);
}
else if ( evtType == wxEVT_LEFT_UP )
{