Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused private BlockContain() function

Browse Source 
This was probably left over after wxGridBlockCoords::ContainsBlock()
introduction.
This commit is contained in:
Vadim Zeitlin
2020-04-05 17:38:08 +02:00
parent 1d43ae7dc6
commit b17d3ecb52
2 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/generic/gridsel.h
View File

@@ -92,14 +92,6 @@ public:
wxVectorGridBlockCoords& GetBlocks() { return m_selection; } wxVectorGridBlockCoords& GetBlocks() { return m_selection; }
private: private:
int BlockContain( int topRow1, int leftCol1,
int bottomRow1, int rightCol1,
int topRow2, int leftCol2,
int bottomRow2, int rightCol2 );
// returns 1, if Block1 contains Block2,
// -1, if Block2 contains Block1,
// 0, otherwise
void SelectBlockNoEvent(const wxGridBlockCoords& block) void SelectBlockNoEvent(const wxGridBlockCoords& block)
{ {
SelectBlock(block.GetTopRow(), block.GetLeftCol(), SelectBlock(block.GetTopRow(), block.GetLeftCol(),

18
src/generic/gridsel.cpp
View File

@@ -697,24 +697,6 @@ wxArrayInt wxGridSelection::GetColSelection() const
return result; return result;
} }
int wxGridSelection::BlockContain( int topRow1, int leftCol1,
int bottomRow1, int rightCol1,
int topRow2, int leftCol2,
int bottomRow2, int rightCol2 )
// returns 1, if Block1 contains Block2,
// -1, if Block2 contains Block1,
// 0, otherwise
{
if ( topRow1 <= topRow2 && bottomRow2 <= bottomRow1 &&
leftCol1 <= leftCol2 && rightCol2 <= rightCol1 )
return 1;
else if ( topRow2 <= topRow1 && bottomRow1 <= bottomRow2 &&
leftCol2 <= leftCol1 && rightCol1 <= rightCol2 )
return -1;
return 0;
}
void void
wxGridSelection::Select(const wxGridBlockCoords& block, wxGridSelection::Select(const wxGridBlockCoords& block,
const wxKeyboardState& kbd, bool sendEvent) const wxKeyboardState& kbd, bool sendEvent)