From b17d3ecb5278adea9c4ef19ffdef34ee53afd8b6 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 5 Apr 2020 17:38:08 +0200 Subject: [PATCH] Remove unused private BlockContain() function This was probably left over after wxGridBlockCoords::ContainsBlock() introduction. --- include/wx/generic/gridsel.h | 8 -------- src/generic/gridsel.cpp | 18 ------------------ 2 files changed, 26 deletions(-) diff --git a/include/wx/generic/gridsel.h b/include/wx/generic/gridsel.h index 5d57e5e447..d53e8815cd 100644 --- a/include/wx/generic/gridsel.h +++ b/include/wx/generic/gridsel.h @@ -92,14 +92,6 @@ public: wxVectorGridBlockCoords& GetBlocks() { return m_selection; } 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) { SelectBlock(block.GetTopRow(), block.GetLeftCol(), diff --git a/src/generic/gridsel.cpp b/src/generic/gridsel.cpp index a7957bd777..f408b0b36c 100644 --- a/src/generic/gridsel.cpp +++ b/src/generic/gridsel.cpp @@ -697,24 +697,6 @@ wxArrayInt wxGridSelection::GetColSelection() const 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 wxGridSelection::Select(const wxGridBlockCoords& block, const wxKeyboardState& kbd, bool sendEvent)