Revert the 2.8 hacks from r51892 on the trunk.

[wxWidgets.git] / tests / benchmarks / printfbench.cpp

diff --git a/tests/benchmarks/printfbench.cpp b/tests/benchmarks/printfbench.cpp
index 49f5d8e43372145a61bd68e024e84c0fc1889eff..147cfa1b2319e7dfd3771fb7ba033604a84ebc47 100644 (file)
--- a/tests/benchmarks/printfbench.cpp
+++ b/tests/benchmarks/printfbench.cpp
@@ -17,27 +17,37 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#include <wx/string.h>
+#include "testprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include <wx/string.h>
+#endif // WX_PRECOMP
+

 #include <wx/stopwatch.h>
 #include <wx/utils.h>
 #include <wx/cmdline.h>
 #include <wx/app.h>
 #include <wx/stopwatch.h>
 #include <wx/utils.h>
 #include <wx/cmdline.h>
 #include <wx/app.h>

+#include <wx/wxchar.h>

 
 
 // ----------------------------------------------------------------------------
 // command line
 // ----------------------------------------------------------------------------
 
 
 
 // ----------------------------------------------------------------------------
 // command line
 // ----------------------------------------------------------------------------
 

-#define HELP_SWITCH              wxT("h")
-#define NUMBENCHMARK_OPTION           wxT("n")
+#define HELP_SWITCH              "h"
+#define NUMBENCHMARK_OPTION           "n"

 
 static const wxCmdLineEntryDesc g_cmdLineDesc[] =
 {
 
 static const wxCmdLineEntryDesc g_cmdLineDesc[] =
 {

-    { wxCMD_LINE_SWITCH, HELP_SWITCH, wxT("help"),
-      wxT("displays help on the command line parameters") },
+    { wxCMD_LINE_SWITCH, HELP_SWITCH, "help",
+      "displays help on the command line parameters" },

 
 

-    { wxCMD_LINE_OPTION, NUMBENCHMARK_OPTION, wxT("numtest"),
-      wxT("the number of wxPrintf() calls to benchmark"), wxCMD_LINE_VAL_NUMBER },
+    { wxCMD_LINE_OPTION, NUMBENCHMARK_OPTION, "numtest",
+      "the number of wxPrintf() calls to benchmark", wxCMD_LINE_VAL_NUMBER },

 
     { wxCMD_LINE_NONE }
 };
 
     { wxCMD_LINE_NONE }
 };