X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1f25eb3aa94958a329714b8793439f131176610e..5ef723747cc680b3c237053bf0e3a78f0f179694:/tests/test.cpp diff --git a/tests/test.cpp b/tests/test.cpp index 00c21251f2..b2fd91868c 100644 --- a/tests/test.cpp +++ b/tests/test.cpp @@ -34,18 +34,25 @@ using std::vector; using std::auto_ptr; using std::cout; +#if wxUSE_GUI + typedef wxApp TestAppBase; +#else + typedef wxAppConsole TestAppBase; +#endif + // The application class // -class TestApp : public wxAppConsole +class TestApp : public TestAppBase { public: TestApp(); // standard overrides - void OnInitCmdLine(wxCmdLineParser& parser); - bool OnCmdLineParsed(wxCmdLineParser& parser); - bool OnInit(); - int OnRun(); + virtual void OnInitCmdLine(wxCmdLineParser& parser); + virtual bool OnCmdLineParsed(wxCmdLineParser& parser); + virtual bool OnInit(); + virtual int OnRun(); + virtual int OnExit(); private: void List(Test *test, const string& parent = "") const; @@ -68,6 +75,9 @@ TestApp::TestApp() // bool TestApp::OnInit() { + if ( !TestAppBase::OnInit() ) + return false; + cout << "Test program for wxWidgets\n" << "build: " << WX_BUILD_OPTIONS_SIGNATURE << std::endl; @@ -78,25 +88,30 @@ bool TestApp::OnInit() cout << "\n"; #endif - return wxAppConsole::OnInit(); +#if wxUSE_GUI + // create a hidden parent window to be used as parent for the GUI controls + new wxFrame(NULL, wxID_ANY, "Hidden wx test frame"); +#endif // wxUSE_GUI + + return true; }; // The table of command line options // void TestApp::OnInitCmdLine(wxCmdLineParser& parser) { - wxAppConsole::OnInitCmdLine(parser); + TestAppBase::OnInitCmdLine(parser); static const wxCmdLineEntryDesc cmdLineDesc[] = { - { wxCMD_LINE_SWITCH, _T("l"), _T("list"), - _T("list the test suites, do not run them"), + { wxCMD_LINE_SWITCH, "l", "list", + "list the test suites, do not run them", wxCMD_LINE_VAL_NONE, 0 }, - { wxCMD_LINE_SWITCH, _T("L"), _T("longlist"), - _T("list the test cases, do not run them"), + { wxCMD_LINE_SWITCH, "L", "longlist", + "list the test cases, do not run them", wxCMD_LINE_VAL_NONE, 0 }, - { wxCMD_LINE_PARAM, "", "", _T("REGISTRY"), wxCMD_LINE_VAL_STRING, + { wxCMD_LINE_PARAM, NULL, NULL, "REGISTRY", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE }, - { wxCMD_LINE_NONE , "", "", "", wxCMD_LINE_VAL_NONE, 0 } + wxCMD_LINE_DESC_END }; parser.SetDesc(cmdLineDesc); @@ -115,7 +130,7 @@ bool TestApp::OnCmdLineParsed(wxCmdLineParser& parser) m_longlist = parser.Found(_T("longlist")); m_list = m_longlist || parser.Found(_T("list")); - return wxAppConsole::OnCmdLineParsed(parser); + return TestAppBase::OnCmdLineParsed(parser); } // Run @@ -155,6 +170,15 @@ int TestApp::OnRun() : EXIT_FAILURE; } +int TestApp::OnExit() +{ +#if wxUSE_GUI + delete GetTopWindow(); +#endif // wxUSE_GUI + + return 0; +} + // List the tests // void TestApp::List(Test *test, const string& parent /*=""*/) const