Improved selection mode handling in wxGrid::SelectBlock
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -29,6 +29,7 @@ public:
|
|||||||
bool IsSelection();
|
bool IsSelection();
|
||||||
bool IsInSelection ( int row, int col );
|
bool IsInSelection ( int row, int col );
|
||||||
void SetSelectionMode(wxGrid::wxGridSelectionModes selmode);
|
void SetSelectionMode(wxGrid::wxGridSelectionModes selmode);
|
||||||
|
wxGrid::wxGridSelectionModes GetSelectionMode() { return m_selectionMode; }
|
||||||
void SelectRow( int row,
|
void SelectRow( int row,
|
||||||
bool ControlDown = FALSE, bool ShiftDown = FALSE,
|
bool ControlDown = FALSE, bool ShiftDown = FALSE,
|
||||||
bool AltDown = FALSE, bool MetaDown = FALSE );
|
bool AltDown = FALSE, bool MetaDown = FALSE );
|
||||||
|
@@ -7665,7 +7665,17 @@ void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol )
|
|||||||
{
|
{
|
||||||
int temp;
|
int temp;
|
||||||
wxGridCellCoords updateTopLeft, updateBottomRight;
|
wxGridCellCoords updateTopLeft, updateBottomRight;
|
||||||
|
|
||||||
|
if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows )
|
||||||
|
{
|
||||||
|
leftCol = 0;
|
||||||
|
rightCol = GetNumberCols() - 1;
|
||||||
|
}
|
||||||
|
else if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectColumns )
|
||||||
|
{
|
||||||
|
topRow = 0;
|
||||||
|
bottomRow = GetNumberRows() - 1;
|
||||||
|
}
|
||||||
if ( topRow > bottomRow )
|
if ( topRow > bottomRow )
|
||||||
{
|
{
|
||||||
temp = topRow;
|
temp = topRow;
|
||||||
|
Reference in New Issue
Block a user