fixes for wxBase compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
c07c37d70a
commit
11eaa98105
@ -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);
|
||||
|
||||
|
@ -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)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user