From 60c0a8dbf449725ab81a0b26ca2538625c81c359 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Wed, 25 Jun 2003 15:09:05 +0000 Subject: [PATCH] fixes to previous commit git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21388 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/fs_mem.h | 5 ++--- src/common/fs_mem.cpp | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h index 62aff0c71c..9309d39b96 100644 --- a/include/wx/fs_mem.h +++ b/include/wx/fs_mem.h @@ -50,10 +50,9 @@ public: virtual wxString FindFirst(const wxString& spec, int flags = 0); virtual wxString FindNext(); -private: - static wxHashTable *m_Hash; - +protected: static bool CheckHash(const wxString& filename); + static wxHashTable *m_Hash; }; class wxMemoryFSHandler : public wxMemoryFSHandlerBase diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp index c94c250e4b..d1129f30b4 100644 --- a/src/common/fs_mem.cpp +++ b/src/common/fs_mem.cpp @@ -23,7 +23,6 @@ #include "wx/bitmap.h" #include "wx/fs_mem.h" -#ifdef __WXBASE__ #ifndef WXPRECOMP #include "wx/intl.h" @@ -75,6 +74,8 @@ class MemFSHashObj : public wxObject } }; +#ifdef __WXBASE__ + //-------------------------------------------------------------------------------- // wxMemoryFSHandler @@ -206,11 +207,10 @@ bool wxMemoryFSHandlerBase::CheckHash(const wxString& filename) #if wxUSE_IMAGE /*static*/ void -wxMemoryFSHandlerBase::AddFile(const wxString& filename, wxImage& image, long type) +wxMemoryFSHandler::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)); -- 2.47.2