Update wxGrid unit tests after r70177.

The row/column selection is not stored in the block arrays, see #12638.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/tests/controls/gridtest.cpp b/tests/controls/gridtest.cpp
index 6bde424215f0a8d9c395eb8751c6c2fe1073ae6f..34da0de16fd5d1de00f8486c3860081d7ad4588b 100644 (file)
--- a/tests/controls/gridtest.cpp
+++ b/tests/controls/gridtest.cpp
@@ -587,16 +587,9 @@ void GridTestCase::SelectionMode()
     m_grid->SetSelectionMode(wxGrid::wxGridSelectRows);
     m_grid->SelectBlock(3, 1, 3, 1);
 
-    wxGridCellCoordsArray topleft = m_grid->GetSelectionBlockTopLeft();
-    wxGridCellCoordsArray bottomright = m_grid->GetSelectionBlockBottomRight();
-
-    CPPUNIT_ASSERT_EQUAL(1, topleft.Count());
-    CPPUNIT_ASSERT_EQUAL(1, bottomright.Count());
-
-    CPPUNIT_ASSERT_EQUAL(0, topleft.Item(0).GetCol());
-    CPPUNIT_ASSERT_EQUAL(3, topleft.Item(0).GetRow());
-    CPPUNIT_ASSERT_EQUAL(1, bottomright.Item(0).GetCol());
-    CPPUNIT_ASSERT_EQUAL(3, bottomright.Item(0).GetRow());
+    wxArrayInt selectedRows = m_grid->GetSelectedRows();
+    CPPUNIT_ASSERT_EQUAL(1, selectedRows.Count());
+    CPPUNIT_ASSERT_EQUAL(3, selectedRows[0]);
 
     CPPUNIT_ASSERT_EQUAL(wxGrid::wxGridSelectRows,
                          m_grid->GetSelectionMode());
@@ -607,16 +600,9 @@ void GridTestCase::SelectionMode()
     m_grid->SetSelectionMode(wxGrid::wxGridSelectColumns);
     m_grid->SelectBlock(3, 1, 3, 1);
 
-    topleft = m_grid->GetSelectionBlockTopLeft();
-    bottomright = m_grid->GetSelectionBlockBottomRight();
-
-    CPPUNIT_ASSERT_EQUAL(1, topleft.Count());
-    CPPUNIT_ASSERT_EQUAL(1, bottomright.Count());
-
-    CPPUNIT_ASSERT_EQUAL(1, topleft.Item(0).GetCol());
-    CPPUNIT_ASSERT_EQUAL(0, topleft.Item(0).GetRow());
-    CPPUNIT_ASSERT_EQUAL(1, bottomright.Item(0).GetCol());
-    CPPUNIT_ASSERT_EQUAL(9, bottomright.Item(0).GetRow());
+    wxArrayInt selectedCols = m_grid->GetSelectedCols();
+    CPPUNIT_ASSERT_EQUAL(1, selectedCols.Count());
+    CPPUNIT_ASSERT_EQUAL(1, selectedCols[0]);
 
     CPPUNIT_ASSERT_EQUAL(wxGrid::wxGridSelectColumns,
                          m_grid->GetSelectionMode());