From 09fa09bf2ba6395965eb2e0327b1626372f0e16f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 27 Apr 2011 18:43:58 +0000 Subject: [PATCH] Add wxUSE_DC_TRANSFORM_MATRIX checks to the unit test. Allow the unit test to compile even when wxUSE_DC_TRANSFORM_MATRIX is 0. See #13092. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- tests/graphics/affinematrix.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/graphics/affinematrix.cpp b/tests/graphics/affinematrix.cpp index ffa4f58d28..0e544663f1 100644 --- a/tests/graphics/affinematrix.cpp +++ b/tests/graphics/affinematrix.cpp @@ -39,16 +39,20 @@ public: private: CPPUNIT_TEST_SUITE( AffineTransformTestCase ); CPPUNIT_TEST( InvertMatrix ); +#if wxUSE_DC_TRANSFORM_MATRIX CPPUNIT_TEST( VMirrorAndTranslate ); CPPUNIT_TEST( Rotate90Clockwise ); +#endif // wxUSE_DC_TRANSFORM_MATRIX CPPUNIT_TEST_SUITE_END(); void InvertMatrix(); +#if wxUSE_DC_TRANSFORM_MATRIX void VMirrorAndTranslate(); void Rotate90Clockwise(); wxImage m_imgOrig; wxBitmap m_bmpOrig; +#endif // wxUSE_DC_TRANSFORM_MATRIX DECLARE_NO_COPY_CLASS(AffineTransformTestCase) }; @@ -61,11 +65,13 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( AffineTransformTestCase, "AffineTransform void AffineTransformTestCase::setUp() { +#if wxUSE_DC_TRANSFORM_MATRIX m_imgOrig.LoadFile("horse.jpg"); CPPUNIT_ASSERT( m_imgOrig.IsOk() ); m_bmpOrig = wxBitmap(m_imgOrig); +#endif // wxUSE_DC_TRANSFORM_MATRIX } void AffineTransformTestCase::InvertMatrix() @@ -91,6 +97,8 @@ void AffineTransformTestCase::InvertMatrix() CPPUNIT_ASSERT( matrix2.IsIdentity() ); } +#if wxUSE_DC_TRANSFORM_MATRIX + void AffineTransformTestCase::VMirrorAndTranslate() { wxBitmap bmpUsingMatrix(m_bmpOrig.GetWidth(), m_bmpOrig.GetHeight()); @@ -138,3 +146,5 @@ void AffineTransformTestCase::Rotate90Clockwise() CPPUNIT_ASSERT_EQUAL( imgUsingMatrix, imgOrigRotate90Clockwise ); } + +#endif // wxUSE_DC_TRANSFORM_MATRIX -- 2.47.2