added wxRect::CentreIn()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -21,6 +21,21 @@
|
||||
#include "wx/gdicmn.h"
|
||||
#endif // WX_PRECOMP
|
||||
|
||||
#include "wx/iosfwrap.h"
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// helper functions
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// this operator is needed to use CPPUNIT_ASSERT_EQUAL with wxRects
|
||||
wxSTD ostream& operator<<(wxSTD ostream& os, const wxRect& r)
|
||||
{
|
||||
os << "{"
|
||||
<< r.x << ", " << r.y << ", " << r.width << ", " << r.height
|
||||
<< "}";
|
||||
return os;
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// test class
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -32,11 +47,13 @@ public:
|
||||
|
||||
private:
|
||||
CPPUNIT_TEST_SUITE( RectTestCase );
|
||||
CPPUNIT_TEST( CentreIn );
|
||||
CPPUNIT_TEST( InflateDeflate );
|
||||
CPPUNIT_TEST( Operators );
|
||||
CPPUNIT_TEST( Union );
|
||||
CPPUNIT_TEST_SUITE_END();
|
||||
|
||||
void CentreIn();
|
||||
void InflateDeflate();
|
||||
void Operators();
|
||||
void Union();
|
||||
@@ -50,6 +67,17 @@ CPPUNIT_TEST_SUITE_REGISTRATION( RectTestCase );
|
||||
// also include in it's own registry so that these tests can be run alone
|
||||
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( RectTestCase, "RectTestCase" );
|
||||
|
||||
void RectTestCase::CentreIn()
|
||||
{
|
||||
typedef wxRect R;
|
||||
|
||||
CPPUNIT_ASSERT_EQUAL( R(45, 45, 10, 10),
|
||||
R(0, 0, 10, 10).CentreIn(R(0, 0, 100, 100)));
|
||||
|
||||
CPPUNIT_ASSERT_EQUAL( R(-5, -5, 20, 20),
|
||||
R(0, 0, 20, 20).CentreIn(R(0, 0, 10, 10)));
|
||||
}
|
||||
|
||||
void RectTestCase::InflateDeflate()
|
||||
{
|
||||
// This is the rectangle from the example in the documentation of wxRect::Inflate().
|
||||
|
Reference in New Issue
Block a user