X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e3778b4d9c7eebc39f496a9dd055638e06fb9140..c2f8c2b245959f612f0ebac31ab8d80bef6ea9e2:/tests/toplevel/toplevel.cpp?ds=sidebyside diff --git a/tests/toplevel/toplevel.cpp b/tests/toplevel/toplevel.cpp index 27799fbd1b..29c68f3906 100644 --- a/tests/toplevel/toplevel.cpp +++ b/tests/toplevel/toplevel.cpp @@ -3,7 +3,6 @@ // Purpose: Tests for wxTopLevelWindow // Author: Kevin Ollivier // Created: 2008-05-25 -// RCS-ID: $Id$ // Copyright: (c) 2009 Kevin Ollivier /////////////////////////////////////////////////////////////////////////////// @@ -18,8 +17,10 @@ #endif #ifndef WX_PRECOMP - #include "wx/app.h" - #include "wx/window.h" + #include "wx/dialog.h" + #include "wx/frame.h" + #include "wx/textctrl.h" + #include "wx/toplevel.h" #endif // WX_PRECOMP #include "wx/evtloop.h" @@ -33,9 +34,6 @@ class TopLevelWindowTestCase : public CppUnit::TestCase public: TopLevelWindowTestCase() { } - virtual void setUp(); - virtual void tearDown(); - private: CPPUNIT_TEST_SUITE( TopLevelWindowTestCase ); CPPUNIT_TEST( DialogShowTest ); @@ -50,22 +48,10 @@ private: }; // register in the unnamed registry so that these tests are run by default -CPPUNIT_TEST_SUITE_REGISTRATION( TopLevelWindowTestCase ); +//CPPUNIT_TEST_SUITE_REGISTRATION( TopLevelWindowTestCase ); // also include in its own registry so that these tests can be run alone -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TopLevelWindowTestCase, "TopLevelWindowTestCase" ); - -// ---------------------------------------------------------------------------- -// test initialization -// ---------------------------------------------------------------------------- - -void TopLevelWindowTestCase::setUp() -{ -} - -void TopLevelWindowTestCase::tearDown() -{ -} +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TopLevelWindowTestCase, "fixme" ); // ---------------------------------------------------------------------------- // tests themselves @@ -88,25 +74,25 @@ void TopLevelWindowTestCase::FrameShowTest() void TopLevelWindowTestCase::TopLevelWindowShowTest(wxTopLevelWindow* tlw) { CPPUNIT_ASSERT(!tlw->IsShown()); - + wxTextCtrl* textCtrl = new wxTextCtrl(tlw, -1, "test"); textCtrl->SetFocus(); - + // only run this test on platforms where ShowWithoutActivating is implemented. -#ifdef __WXMSW__ || defined(__WXMAC__) +#if defined(__WXMSW__) || defined(__WXMAC__) tlw->ShowWithoutActivating(); CPPUNIT_ASSERT(tlw->IsShown()); CPPUNIT_ASSERT(!tlw->IsActive()); - + tlw->Hide(); CPPUNIT_ASSERT(!tlw->IsShown()); CPPUNIT_ASSERT(!tlw->IsActive()); #endif - + tlw->Show(true); CPPUNIT_ASSERT(tlw->IsActive()); CPPUNIT_ASSERT(tlw->IsShown()); - + tlw->Hide(); CPPUNIT_ASSERT(!tlw->IsShown()); CPPUNIT_ASSERT(tlw->IsActive());