Remove wxGridSelection::ToggleCellSelection()
Remove the function because it's not usefull anymore and used only in one place.
This commit is contained in:
committed by
Vadim Zeitlin
parent
cdf3187fe5
commit
d4919d3334
@@ -52,14 +52,6 @@ public:
|
|||||||
kbd, sendEvent);
|
kbd, sendEvent);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ToggleCellSelection(int row, int col,
|
|
||||||
const wxKeyboardState& kbd = wxKeyboardState());
|
|
||||||
void ToggleCellSelection(const wxGridCellCoords& coords,
|
|
||||||
const wxKeyboardState& kbd = wxKeyboardState())
|
|
||||||
{
|
|
||||||
ToggleCellSelection(coords.GetRow(), coords.GetCol(), kbd);
|
|
||||||
}
|
|
||||||
|
|
||||||
void DeselectBlock(const wxGridBlockCoords& block,
|
void DeselectBlock(const wxGridBlockCoords& block,
|
||||||
const wxKeyboardState& kbd = wxKeyboardState(),
|
const wxKeyboardState& kbd = wxKeyboardState(),
|
||||||
bool sendEvent = true );
|
bool sendEvent = true );
|
||||||
|
@@ -4577,7 +4577,21 @@ wxGrid::DoGridCellLeftDown(wxMouseEvent& event,
|
|||||||
{
|
{
|
||||||
if ( m_selection )
|
if ( m_selection )
|
||||||
{
|
{
|
||||||
m_selection->ToggleCellSelection(coords, event);
|
if ( !m_selection->IsInSelection(coords) )
|
||||||
|
{
|
||||||
|
// If the cell is not selected, select it.
|
||||||
|
m_selection->SelectBlock(coords.GetRow(), coords.GetCol(),
|
||||||
|
coords.GetRow(), coords.GetCol(),
|
||||||
|
event);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Otherwise deselect it.
|
||||||
|
m_selection->DeselectBlock(
|
||||||
|
wxGridBlockCoords(coords.GetRow(), coords.GetCol(),
|
||||||
|
coords.GetRow(), coords.GetCol()),
|
||||||
|
event);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
m_selectedBlockTopLeft = wxGridNoCellCoords;
|
m_selectedBlockTopLeft = wxGridNoCellCoords;
|
||||||
|
@@ -183,23 +183,6 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol,
|
|||||||
kbd, sendEvent);
|
kbd, sendEvent);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
wxGridSelection::ToggleCellSelection(int row, int col,
|
|
||||||
const wxKeyboardState& kbd)
|
|
||||||
{
|
|
||||||
// if the cell is not selected, select it
|
|
||||||
if ( !IsInSelection ( row, col ) )
|
|
||||||
{
|
|
||||||
SelectBlock(row, col, row, col, kbd);
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// otherwise deselect it.
|
|
||||||
DeselectBlock(wxGridBlockCoords(row, col, row, col), kbd);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
wxGridSelection::DeselectBlock(const wxGridBlockCoords& block,
|
wxGridSelection::DeselectBlock(const wxGridBlockCoords& block,
|
||||||
const wxKeyboardState& kbd,
|
const wxKeyboardState& kbd,
|
||||||
|
Reference in New Issue
Block a user