From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 24 Dec 2011 17:58:32 +0000 (+0000)
Subject: Don't use deprecated methods in wxGrid test.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b73da1a41bc27c68133f54debbbfe7597c869637

Don't use deprecated methods in wxGrid test.

Don't use the methods defined only when building 2.8-compatible mode to let
the tests compile even with WXWIN_COMPATIBILITY_2_8 off. This only worked
before because of the wrong tests in grid.h but broke after the fixes of
r70098.

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

diff --git a/tests/controls/gridtest.cpp b/tests/controls/gridtest.cpp
index 49effd1dcf..0bb469ab37 100644
--- a/tests/controls/gridtest.cpp
+++ b/tests/controls/gridtest.cpp
@@ -644,7 +644,7 @@ void GridTestCase::CellFormatting()
 
     CPPUNIT_ASSERT_EQUAL(back, m_grid->GetCellTextColour(0, 0));
 
-    m_grid->SetCellAlignment(wxALIGN_CENTRE, 0, 0);
+    m_grid->SetCellAlignment(0, 0, wxALIGN_CENTRE);
     m_grid->GetCellAlignment(0, 0, &cellhoriz, &cellvert);
 
     CPPUNIT_ASSERT_EQUAL(static_cast<int>(wxALIGN_CENTRE), cellhoriz);
@@ -656,7 +656,7 @@ void GridTestCase::CellFormatting()
     CPPUNIT_ASSERT_EQUAL(static_cast<int>(wxALIGN_LEFT), cellhoriz);
     CPPUNIT_ASSERT_EQUAL(static_cast<int>(wxALIGN_BOTTOM), cellvert);
 
-    m_grid->SetCellTextColour(*wxRED, 0, 0);
+    m_grid->SetCellTextColour(0, 0, *wxRED);
 
     CPPUNIT_ASSERT_EQUAL(*wxRED, m_grid->GetCellTextColour(0, 0));