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
This commit is contained in:
@@ -922,8 +922,7 @@ protected:
|
|||||||
int m_batchCount;
|
int m_batchCount;
|
||||||
|
|
||||||
int m_cursorMode;
|
int m_cursorMode;
|
||||||
enum { WXGRID_CURSOR_DEFAULT,
|
enum { WXGRID_CURSOR_SELECT_CELL,
|
||||||
WXGRID_CURSOR_SELECT_CELL,
|
|
||||||
WXGRID_CURSOR_RESIZE_ROW,
|
WXGRID_CURSOR_RESIZE_ROW,
|
||||||
WXGRID_CURSOR_RESIZE_COL,
|
WXGRID_CURSOR_RESIZE_COL,
|
||||||
WXGRID_CURSOR_SELECT_ROW,
|
WXGRID_CURSOR_SELECT_ROW,
|
||||||
|
@@ -1612,6 +1612,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
|
||||||
m_dragLastPos = -1;
|
m_dragLastPos = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1800,6 +1801,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
|
||||||
m_dragLastPos = -1;
|
m_dragLastPos = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2005,6 +2007,13 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
|
|||||||
// no default action at the moment
|
// no default action at the moment
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ------------ Moving and no button action
|
||||||
|
//
|
||||||
|
else if ( event.Moving() && !event.IsButton() )
|
||||||
|
{
|
||||||
|
m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user