fixes for wxBase compilation

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

diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h
index a24b0dcfcef168923fe6db48b838de81af92d93c..f85dd29f39f6a753e2b40a7a3c25e355f5fbe25b 100644 (file)
--- a/include/wx/fs_mem.h
+++ b/include/wx/fs_mem.h
@@ -24,8 +24,10 @@
 #endif
 
 #include "wx/filesys.h"
 #endif
 
 #include "wx/filesys.h"

+#if wxUSE_GUI

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

+#endif

 
 //--------------------------------------------------------------------------------
 // wxMemoryFSHandler
 
 //--------------------------------------------------------------------------------
 // wxMemoryFSHandler


@@ -39,8 +41,10 @@ class WXDLLEXPORT wxMemoryFSHandler : public wxFileSystemHandler
 
         // Add file to list of files stored in memory. Stored data (bitmap, text or raw data)
         // will be copied into private memory stream and available under name "memory:" + filename
 
         // Add file to list of files stored in memory. Stored data (bitmap, text or raw data)
         // will be copied into private memory stream and available under name "memory:" + filename

+#if wxUSE_GUI

         static void AddFile(const wxString& filename, wxImage& image, long type);
         static void AddFile(const wxString& filename, const wxBitmap& bitmap, long type);
         static void AddFile(const wxString& filename, wxImage& image, long type);
         static void AddFile(const wxString& filename, const wxBitmap& bitmap, long type);

+#endif

         static void AddFile(const wxString& filename, const wxString& textdata);        
         static void AddFile(const wxString& filename, const void *binarydata, size_t size);
         
         static void AddFile(const wxString& filename, const wxString& textdata);        
         static void AddFile(const wxString& filename, const void *binarydata, size_t size);
         

diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index 2a4acc11107a2662418889f8ef4fbe1cde9a5a52..3b45f31ae287b1cbe6ebc1f0c49263e564d5e48f 100644 (file)
--- a/src/common/fs_mem.cpp
+++ b/src/common/fs_mem.cpp
@@ -149,6 +149,8 @@ bool wxMemoryFSHandler::CheckHash(const wxString& filename)
 
 
 
 
 
 

+#if wxUSE_GUI
+

 /*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, wxImage& image, long type)
 {
     if (!CheckHash(filename)) return;
 /*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, wxImage& image, long type)
 {
     if (!CheckHash(filename)) return;


@@ -173,6 +175,7 @@ bool wxMemoryFSHandler::CheckHash(const wxString& filename)
     AddFile(filename, img, type);
 }
 
     AddFile(filename, img, type);
 }
 

+#endif

 
 /*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, const wxString& textdata)
 {
 
 /*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, const wxString& textdata)
 {