From: Michael Bedward Date: Mon, 7 Feb 2000 05:39:28 +0000 (+0000) Subject: Fixes for problem where selection fails to start on dragging mouse in X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/790cc4177aa62b120eaf61d486b39e5f27c93d4b Fixes for problem where selection fails to start on dragging mouse in grid cell window. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h index e6aa4f7f7a..61912549dc 100644 --- a/include/wx/generic/grid.h +++ b/include/wx/generic/grid.h @@ -922,8 +922,7 @@ protected: int m_batchCount; int m_cursorMode; - enum { WXGRID_CURSOR_DEFAULT, - WXGRID_CURSOR_SELECT_CELL, + enum { WXGRID_CURSOR_SELECT_CELL, WXGRID_CURSOR_RESIZE_ROW, WXGRID_CURSOR_RESIZE_COL, WXGRID_CURSOR_SELECT_ROW, diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index 88a2520a58..48e9a6b61a 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -1612,6 +1612,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event ) } } + m_cursorMode = WXGRID_CURSOR_SELECT_CELL; m_dragLastPos = -1; } @@ -1800,6 +1801,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event ) } } + m_cursorMode = WXGRID_CURSOR_SELECT_CELL; m_dragLastPos = -1; } @@ -2005,6 +2007,13 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event ) // no default action at the moment } } + + // ------------ Moving and no button action + // + else if ( event.Moving() && !event.IsButton() ) + { + m_cursorMode = WXGRID_CURSOR_SELECT_CELL; + } } }