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

fixes to previous commit

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

5
include/wx/fs_mem.h
View File

@@ -50,10 +50,9 @@ public:
virtual wxString FindFirst(const wxString& spec, int flags = 0); virtual wxString FindFirst(const wxString& spec, int flags = 0);
virtual wxString FindNext(); virtual wxString FindNext();
private: protected:
static wxHashTable *m_Hash;
static bool CheckHash(const wxString& filename); static bool CheckHash(const wxString& filename);
static wxHashTable *m_Hash;
}; };
class wxMemoryFSHandler : public wxMemoryFSHandlerBase class wxMemoryFSHandler : public wxMemoryFSHandlerBase

6
src/common/fs_mem.cpp
View File

@@ -23,7 +23,6 @@
#include "wx/bitmap.h" #include "wx/bitmap.h"
#include "wx/fs_mem.h" #include "wx/fs_mem.h"
#ifdef __WXBASE__
#ifndef WXPRECOMP #ifndef WXPRECOMP
#include "wx/intl.h" #include "wx/intl.h"
@@ -75,6 +74,8 @@ class MemFSHashObj : public wxObject
} }
}; };
#ifdef __WXBASE__
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------
// wxMemoryFSHandler // wxMemoryFSHandler
@@ -206,11 +207,10 @@ bool wxMemoryFSHandlerBase::CheckHash(const wxString& filename)
#if wxUSE_IMAGE #if wxUSE_IMAGE
/*static*/ void /*static*/ void
wxMemoryFSHandlerBase::AddFile(const wxString& filename, wxImage& image, long type) wxMemoryFSHandler::AddFile(const wxString& filename, wxImage& image, long type)
{ {
if (!CheckHash(filename)) return; if (!CheckHash(filename)) return;
wxMemoryOutputStream mems; wxMemoryOutputStream mems;
if (image.Ok() && image.SaveFile(mems, (int)type)) if (image.Ok() && image.SaveFile(mems, (int)type))
m_Hash -> Put(filename, new MemFSHashObj(mems)); m_Hash -> Put(filename, new MemFSHashObj(mems));