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

moved AddFile(wxImage) to GUI part of library, too

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-06-25 14:59:02 +00:00
parent 08b3ac36d9
commit 2de5a6ee23
2 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/fs_mem.h
View File

@@ -39,9 +39,6 @@ public:
// Add file to list of files stored in memory. Stored data (bitmap, text or // 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 // raw data) will be copied into private memory stream and available under
// name "memory:" + filename // name "memory:" + filename
#if wxUSE_IMAGE
static void AddFile(const wxString& filename, wxImage& image, long type);
#endif // wxUSE_IMAGE
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);
@@ -63,6 +60,9 @@ class wxMemoryFSHandler : public wxMemoryFSHandlerBase
{ {
public: public:
#if wxUSE_GUI #if wxUSE_GUI
#if wxUSE_IMAGE
static void AddFile(const wxString& filename, wxImage& image, long type);
#endif // wxUSE_IMAGE
static void AddFile(const wxString& filename, const wxBitmap& bitmap, long type); static void AddFile(const wxString& filename, const wxBitmap& bitmap, long type);
#endif // wxUSE_GUI #endif // wxUSE_GUI
}; };

42
src/common/fs_mem.cpp
View File

@@ -172,28 +172,6 @@ bool wxMemoryFSHandlerBase::CheckHash(const wxString& filename)
} }
#if wxUSE_IMAGE
/*static*/ void
wxMemoryFSHandlerBase::AddFile(const wxString& filename, wxImage& image, long type)
{
if (!CheckHash(filename)) return;
wxMemoryOutputStream mems;
if (image.Ok() && image.SaveFile(mems, (int)type))
m_Hash -> Put(filename, new MemFSHashObj(mems));
else
{
wxString s;
s.Printf(_("Failed to store image '%s' to memory VFS!"), filename.c_str());
wxPrintf(wxT("'%s'\n"), s.c_str());
wxLogError(s);
}
}
#endif // wxUSE_IMAGE
/*static*/ void wxMemoryFSHandlerBase::AddFile(const wxString& filename, const wxString& textdata) /*static*/ void wxMemoryFSHandlerBase::AddFile(const wxString& filename, const wxString& textdata)
{ {
AddFile(filename, (const void*) textdata.mb_str(), textdata.Length()); AddFile(filename, (const void*) textdata.mb_str(), textdata.Length());
@@ -226,6 +204,26 @@ wxMemoryFSHandlerBase::AddFile(const wxString& filename, wxImage& image, long ty
#if wxUSE_GUI #if wxUSE_GUI
#if wxUSE_IMAGE
/*static*/ void
wxMemoryFSHandlerBase::AddFile(const wxString& filename, wxImage& image, long type)
{
if (!CheckHash(filename)) return;
wxMemoryOutputStream mems;
if (image.Ok() && image.SaveFile(mems, (int)type))
m_Hash -> Put(filename, new MemFSHashObj(mems));
else
{
wxString s;
s.Printf(_("Failed to store image '%s' to memory VFS!"), filename.c_str());
wxPrintf(wxT("'%s'\n"), s.c_str());
wxLogError(s);
}
}
#endif // wxUSE_IMAGE
/*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, const wxBitmap& bitmap, long type) /*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, const wxBitmap& bitmap, long type)
{ {
wxImage img = bitmap.ConvertToImage(); wxImage img = bitmap.ConvertToImage();