From 11eaa98105f96ad6123283f519abf3ac0e5e5804 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 4 Mar 2000 20:37:08 +0000 Subject: [PATCH] fixes for wxBase compilation git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/fs_mem.h | 4 ++++ src/common/fs_mem.cpp | 3 +++ 2 files changed, 7 insertions(+) diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h index a24b0dcfce..f85dd29f39 100644 --- a/include/wx/fs_mem.h +++ b/include/wx/fs_mem.h @@ -24,8 +24,10 @@ #endif #include "wx/filesys.h" +#if wxUSE_GUI #include "wx/image.h" #include "wx/bitmap.h" +#endif //-------------------------------------------------------------------------------- // 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 +#if wxUSE_GUI 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); diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp index 2a4acc1110..3b45f31ae2 100644 --- 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; @@ -173,6 +175,7 @@ bool wxMemoryFSHandler::CheckHash(const wxString& filename) AddFile(filename, img, type); } +#endif /*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, const wxString& textdata) { -- 2.45.2