fix PCH-less build

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/animdecod.h b/include/wx/animdecod.h
index e803953fe24efcb6faafa8672756e3952e3cf13e..899c04418593e3b5554280963c50ceca96308860 100644 (file)
--- a/include/wx/animdecod.h
+++ b/include/wx/animdecod.h
@@ -16,6 +16,7 @@
 
 #include "wx/colour.h"
 #include "wx/gdicmn.h"
 
 #include "wx/colour.h"
 #include "wx/gdicmn.h"

+#include "wx/log.h"

 
 class WXDLLIMPEXP_FWD_BASE wxInputStream;
 class WXDLLIMPEXP_FWD_CORE wxImage;
 
 class WXDLLIMPEXP_FWD_BASE wxInputStream;
 class WXDLLIMPEXP_FWD_CORE wxImage;

diff --git a/tests/benchmarks/printfbench.cpp b/tests/benchmarks/printfbench.cpp
index 7ee4cf9314df14dccea12e9dbd3929d8b4f5b034..159c29bad3fb67912cecd765c076573a31fb15a4 100644 (file)
--- a/tests/benchmarks/printfbench.cpp
+++ b/tests/benchmarks/printfbench.cpp
@@ -62,15 +62,15 @@ const wxString g_verylongString =
 #define DO_LONG_BENCHMARK(fnc, prefix)                                                     \
     fnc(buffer, BUFSIZE,                                                                   \
         prefix##"This is a reasonably long string with various %s arguments, exactly %d, " \
 #define DO_LONG_BENCHMARK(fnc, prefix)                                                     \
     fnc(buffer, BUFSIZE,                                                                   \
         prefix##"This is a reasonably long string with various %s arguments, exactly %d, " \

-        "and is used as benchmark for %s - %% %.2f %d %s",                                 \
-        "(many!!)", 6, "this program", 23.342f, 999,                                       \
+        prefix##"and is used as benchmark for %s - %% %.2f %d %s",                                 \
+        prefix##"(many!!)", 6, "this program", 23.342f, 999,                                       \

         (const char*)g_verylongString.c_str());
 
 #define DO_LONG_POSITIONAL_BENCHMARK(fnc, prefix)                                          \
     fnc(buffer, BUFSIZE,                                                                   \
         prefix##"This is a %2$s and thus is harder to parse... let's %1$s "                \
         (const char*)g_verylongString.c_str());
 
 #define DO_LONG_POSITIONAL_BENCHMARK(fnc, prefix)                                          \
     fnc(buffer, BUFSIZE,                                                                   \
         prefix##"This is a %2$s and thus is harder to parse... let's %1$s "                \

-        "for our benchmarking aims - %% %3$f %5$d %4$s",                                   \
-        "test it", "string with positional arguments", 23.342f,                            \
+        prefix##"for our benchmarking aims - %% %3$f %5$d %4$s",                                   \
+        prefix##"test it", "string with positional arguments", 23.342f,                            \

         (const char*)g_verylongString.c_str(), 999);
 
 #define DO_BENCHMARK(fnc, prefix)                                                          \
         (const char*)g_verylongString.c_str(), 999);
 
 #define DO_BENCHMARK(fnc, prefix)                                                          \

diff --git a/tests/image/image.cpp b/tests/image/image.cpp
index 80dee8376cadc13a64ca3bfcf5fafb3cde655593..985a0bc9845381faa56e7c569110ddde95176ff9 100644 (file)
--- a/tests/image/image.cpp
+++ b/tests/image/image.cpp
@@ -21,7 +21,7 @@
 #ifndef WX_PRECOMP
 #endif // WX_PRECOMP
 
 #ifndef WX_PRECOMP
 #endif // WX_PRECOMP
 

-#include "wx/bitmap.h"
+#include "wx/image.h"

 #include "wx/url.h"
 #include "wx/mstream.h"
 #include "wx/zstream.h"
 #include "wx/url.h"
 #include "wx/mstream.h"
 #include "wx/zstream.h"