really show the window after creation (calling Show(TRUE) doesn't do it any more)

[wxWidgets.git] / src / common / fs_mem.cpp

diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index a1013b5bde1dc6d87f02590ffecd8dd526ebcb44..782b95d758e608c98088e5862ad048233db07c09 100644 (file)
--- a/src/common/fs_mem.cpp
+++ b/src/common/fs_mem.cpp
@@ -7,7 +7,14 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) && !defined(__EMX__)
+// Some older compilers (such as EMX) cannot handle
+// #pragma interface/implementation correctly, iff 
+// #pragma implementation is used in _two_ translation
+// units (as created by e.g. event.cpp compiled for
+// libwx_base and event.cpp compiled for libwx_gui_core).
+// So we must not use those pragmas for those compilers in
+// such files.
 #pragma implementation "fs_mem.h"
 #endif
 
@@ -101,6 +108,7 @@ wxMemoryFSHandlerBase::~wxMemoryFSHandlerBase()
 
     if (m_Hash)
     {
+        WX_CLEAR_HASH_TABLE(*m_Hash);
         delete m_Hash;
         m_Hash = NULL;
     }
@@ -160,7 +168,6 @@ bool wxMemoryFSHandlerBase::CheckHash(const wxString& filename)
     if (m_Hash == NULL)
     {
         m_Hash = new wxHashTable(wxKEY_STRING);
-        m_Hash -> DeleteContents(TRUE);
     }
 
     if (m_Hash -> Get(filename) != NULL)
@@ -224,7 +231,6 @@ wxMemoryFSHandler::AddFile(const wxString& filename, wxImage& image, long type)
         wxLogError(s);
     }
 }
-#endif // wxUSE_IMAGE
 
 /*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, const wxBitmap& bitmap, long type)
 {
@@ -232,7 +238,9 @@ wxMemoryFSHandler::AddFile(const wxString& filename, wxImage& image, long type)
     AddFile(filename, img, type);
 }
 
-#endif
+#endif // wxUSE_IMAGE
+
+#endif // wxUSE_GUI
 
 
 #endif // wxUSE_FILESYSTEM && wxUSE_FS_ZIP