fixes to previous commit

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21388 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h
index 62aff0c71c2e6e5e46b31390adab662b5681718e..9309d39b9644b8f8e61eb7a8064963767d1e2615 100644 (file)
--- 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();
 
     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 bool CheckHash(const wxString& filename);

+    static wxHashTable *m_Hash;

 };
 
 class wxMemoryFSHandler : public wxMemoryFSHandlerBase
 };
 
 class wxMemoryFSHandler : public wxMemoryFSHandlerBase

diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index c94c250e4bbcf84d457f7825870369ab80d3e39f..d1129f30b448971cc1009a6e73f9309bd27ea9d2 100644 (file)
--- 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"
 
 #include "wx/bitmap.h"
 #include "wx/fs_mem.h"
 

-#ifdef __WXBASE__

 
 #ifndef WXPRECOMP
     #include "wx/intl.h"
 
 #ifndef WXPRECOMP
     #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
 /*static*/ void
 
 #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;
 
 {
     if (!CheckHash(filename)) return;
 

-

     wxMemoryOutputStream mems;
     if (image.Ok() && image.SaveFile(mems, (int)type))
         m_Hash -> Put(filename, new MemFSHashObj(mems));
     wxMemoryOutputStream mems;
     if (image.Ok() && image.SaveFile(mems, (int)type))
         m_Hash -> Put(filename, new MemFSHashObj(mems));