X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3e5f6c1c4f79af395e094be3fa2957394e2e5825..2458d90b1d5a26dc667c2deac63e499570744f5f:/tests/test.cpp

diff --git a/tests/test.cpp b/tests/test.cpp
index 97df72a276..e6861bee35 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -7,13 +7,9 @@
 // Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma implementation
-    #pragma interface
-#endif
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
+// For compilers that support precompilation, includes "wx/wx.h"
+// and "wx/cppunit.h"
+#include "testprec.h"
 
 #ifdef __BORLANDC__
     #pragma hdrstop
@@ -25,7 +21,6 @@
 #endif
 
 #include "wx/cmdline.h"
-#include "wx/cppunit.h"
 #include <iostream>
 
 using CppUnit::Test;
@@ -114,7 +109,6 @@ bool TestApp::OnCmdLineParsed(wxCmdLineParser& parser)
     return wxAppConsole::OnCmdLineParsed(parser);
 }
 
-#include "wx/uri.h"
 // Run
 //
 int TestApp::OnRun()
@@ -161,7 +155,9 @@ void TestApp::List(Test *test, const string& parent /*=""*/) const
         // take the last component of the name and append to the parent
         name = test->getName();
         string::size_type i = name.find_last_of(".:");
-        name = parent + "." + (i != string::npos ? name.substr(i + 1) : name);
+        if (i != string::npos)
+            name = name.substr(i + 1);
+        name = parent + "." + name;
 
         // drop the 1st component from the display and indent
         if (parent != "") {