From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 24 Dec 2011 18:30:52 +0000 (+0000)
Subject: Really fix the use of deprecated methods in wxGrid test.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4a04898fe048cc8281e051e42af926924e806b6e

Really fix the use of deprecated methods in wxGrid test.

The changes of r70111 were wrong, the unit test for wxGrid really did intend
to test the deprecated methods so restore them -- but only in
WXWIN_COMPATIBILITY_2_8 case.

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

diff --git a/tests/controls/gridtest.cpp b/tests/controls/gridtest.cpp
index 0bb469ab37..6bde424215 100644
--- a/tests/controls/gridtest.cpp
+++ b/tests/controls/gridtest.cpp
@@ -644,11 +644,13 @@ void GridTestCase::CellFormatting()
 
     CPPUNIT_ASSERT_EQUAL(back, m_grid->GetCellTextColour(0, 0));
 
-    m_grid->SetCellAlignment(0, 0, wxALIGN_CENTRE);
+#if WXWIN_COMPATIBILITY_2_8
+    m_grid->SetCellAlignment(wxALIGN_CENTRE, 0, 0);
     m_grid->GetCellAlignment(0, 0, &cellhoriz, &cellvert);
 
     CPPUNIT_ASSERT_EQUAL(static_cast<int>(wxALIGN_CENTRE), cellhoriz);
     CPPUNIT_ASSERT_EQUAL(static_cast<int>(wxALIGN_CENTRE), cellvert);
+#endif // WXWIN_COMPATIBILITY_2_8
 
     m_grid->SetCellAlignment(0, 0, wxALIGN_LEFT, wxALIGN_BOTTOM);
     m_grid->GetCellAlignment(0, 0, &cellhoriz, &cellvert);
@@ -656,12 +658,12 @@ void GridTestCase::CellFormatting()
     CPPUNIT_ASSERT_EQUAL(static_cast<int>(wxALIGN_LEFT), cellhoriz);
     CPPUNIT_ASSERT_EQUAL(static_cast<int>(wxALIGN_BOTTOM), cellvert);
 
-    m_grid->SetCellTextColour(0, 0, *wxRED);
-
+#if WXWIN_COMPATIBILITY_2_8
+    m_grid->SetCellTextColour(*wxRED, 0, 0);
     CPPUNIT_ASSERT_EQUAL(*wxRED, m_grid->GetCellTextColour(0, 0));
+#endif // WXWIN_COMPATIBILITY_2_8
 
     m_grid->SetCellTextColour(0, 0, *wxGREEN);
-
     CPPUNIT_ASSERT_EQUAL(*wxGREEN, m_grid->GetCellTextColour(0, 0));
 }