Don't capture the mouse until after we're sure we're not sending
wxEVT_GRID_CELL_BEGIN_DRAG git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@44341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -5921,13 +5921,6 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
|
|||||||
SaveEditControlValue();
|
SaveEditControlValue();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Have we captured the mouse yet?
|
|
||||||
if (! m_winCapture)
|
|
||||||
{
|
|
||||||
m_winCapture = m_gridWin;
|
|
||||||
m_winCapture->CaptureMouse();
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( coords != wxGridNoCellCoords )
|
if ( coords != wxGridNoCellCoords )
|
||||||
{
|
{
|
||||||
if ( event.CmdDown() )
|
if ( event.CmdDown() )
|
||||||
@@ -5947,6 +5940,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
|
|||||||
coords.GetRow(),
|
coords.GetRow(),
|
||||||
coords.GetCol(),
|
coords.GetCol(),
|
||||||
event );
|
event );
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -5968,6 +5962,14 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
|
|||||||
// scrolling is way to fast, at least on MSW - also on GTK.
|
// scrolling is way to fast, at least on MSW - also on GTK.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Have we captured the mouse yet?
|
||||||
|
if (! m_winCapture)
|
||||||
|
{
|
||||||
|
m_winCapture = m_gridWin;
|
||||||
|
m_winCapture->CaptureMouse();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
|
else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user