Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes for wxBase compilation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2000-03-04 20:37:08 +00:00
parent c07c37d70a
commit 11eaa98105
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/fs_mem.h
View File

@@ -24,8 +24,10 @@
#endif #endif
#include "wx/filesys.h" #include "wx/filesys.h"
#if wxUSE_GUI
#include "wx/image.h" #include "wx/image.h"
#include "wx/bitmap.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) // 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 // 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, wxImage& image, long type);
static void AddFile(const wxString& filename, const wxBitmap& bitmap, 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 wxString& textdata);
static void AddFile(const wxString& filename, const void *binarydata, size_t size); static void AddFile(const wxString& filename, const void *binarydata, size_t size);

3
src/common/fs_mem.cpp
View File

@@ -149,6 +149,8 @@ bool wxMemoryFSHandler::CheckHash(const wxString& filename)
#if wxUSE_GUI
/*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, wxImage& image, long type) /*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, wxImage& image, long type)
{ {
if (!CheckHash(filename)) return; 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)
{ {