Better fix

[wxWidgets.git] / tests / test.cpp

diff --git a/tests/test.cpp b/tests/test.cpp
index 00c21251f20fd107b2dd09ff9a59c045fd6a6cb4..d65ec1fbfa1144fd4e6ebdf39a6fc036ec0061c9 100644 (file)
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -29,23 +29,27 @@ using CppUnit::TestFactoryRegistry;
 using CppUnit::TextUi::TestRunner;
 using CppUnit::CompilerOutputter;
 
-using std::string;
-using std::vector;
-using std::auto_ptr;
-using std::cout;
+using namespace std;
+
+#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 +72,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 +85,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 +127,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 +167,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