non-pch build fixes, after r53535

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

diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h
index ba1308c7d09920f2184e0681da09c7c08aac3147..ae40a1599f3b78ec1dc5e9752de03171f2fc239f 100644 (file)
--- a/include/wx/fs_mem.h
+++ b/include/wx/fs_mem.h
@@ -16,8 +16,7 @@
 #include "wx/filesys.h"
 
 #if wxUSE_GUI
-    class WXDLLIMPEXP_FWD_CORE wxBitmap;
-    class WXDLLIMPEXP_FWD_CORE wxImage;
+    #include "wx/bitmap.h"
 #endif // wxUSE_GUI
 
 // ----------------------------------------------------------------------------

diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index bd6b01618a3b5786d38622b29118ba54f12007db..4d9ba72339f6d63090c2ee1d7ab488f48b943559 100644 (file)
--- a/src/common/fs_mem.cpp
+++ b/src/common/fs_mem.cpp
@@ -23,7 +23,6 @@
     #include "wx/hash.h"
     #include "wx/wxcrtvararg.h"
     #if wxUSE_GUI
-        #include "wx/bitmap.h"
         #include "wx/image.h"
     #endif // wxUSE_GUI
 #endif

diff --git a/src/richtext/richtextxml.cpp b/src/richtext/richtextxml.cpp
index e76f7a0edb1d19b6df1bd907a3d407999211d0e7..74d6bbf9d70103bc042ae2e3abc434fb65965175 100644 (file)
--- a/src/richtext/richtextxml.cpp
+++ b/src/richtext/richtextxml.cpp
@@ -23,6 +23,7 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/module.h"
+    #include "wx/log.h"
 #endif
 
 #include "wx/filename.h"