(blind) fix for gcc 3.4 warning for an always true comparison in an assert

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

diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index 70fd638425cd067ee4eadffd05d3e281530d6b45..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
 
 #pragma implementation "fs_mem.h"
 #endif
 


@@ -19,11 +26,12 @@
 
 #if wxUSE_FILESYSTEM && wxUSE_STREAMS
 
 
 #if wxUSE_FILESYSTEM && wxUSE_STREAMS
 

-#include "wx/image.h"
-#include "wx/bitmap.h"

 #include "wx/fs_mem.h"
 
 #include "wx/fs_mem.h"
 

-#ifdef __WXBASE__
+#if wxUSE_GUI
+    #include "wx/image.h"
+    #include "wx/bitmap.h"
+#endif // wxUSE_GUI

 
 #ifndef WXPRECOMP
     #include "wx/intl.h"
 
 #ifndef WXPRECOMP
     #include "wx/intl.h"


@@ -75,6 +83,8 @@ class MemFSHashObj : public wxObject
         }
 };
 
         }
 };
 

+#if wxUSE_BASE
+

 
 //--------------------------------------------------------------------------------
 // wxMemoryFSHandler
 
 //--------------------------------------------------------------------------------
 // wxMemoryFSHandler


@@ -98,6 +108,7 @@ wxMemoryFSHandlerBase::~wxMemoryFSHandlerBase()
 
     if (m_Hash)
     {
 
     if (m_Hash)
     {

+        WX_CLEAR_HASH_TABLE(*m_Hash);

         delete m_Hash;
         m_Hash = NULL;
     }
         delete m_Hash;
         m_Hash = NULL;
     }


@@ -157,7 +168,6 @@ bool wxMemoryFSHandlerBase::CheckHash(const wxString& filename)
     if (m_Hash == NULL)
     {
         m_Hash = new wxHashTable(wxKEY_STRING);
     if (m_Hash == NULL)
     {
         m_Hash = new wxHashTable(wxKEY_STRING);

-        m_Hash -> DeleteContents(TRUE);

     }
 
     if (m_Hash -> Get(filename) != NULL)
     }
 
     if (m_Hash -> Get(filename) != NULL)


@@ -172,28 +182,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)
 {
     AddFile(filename, (const void*) textdata.mb_str(), textdata.Length());
 /*static*/ void wxMemoryFSHandlerBase::AddFile(const wxString& filename, const wxString& textdata)
 {
     AddFile(filename, (const void*) textdata.mb_str(), textdata.Length());


@@ -222,17 +210,37 @@ wxMemoryFSHandlerBase::AddFile(const wxString& filename, wxImage& image, long ty
         delete m_Hash -> Delete(filename);
 }
 
         delete m_Hash -> Delete(filename);
 }
 

-#endif // __WXBASE__
+#endif // wxUSE_BASE

 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI
 

+#if wxUSE_IMAGE
+/*static*/ void
+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));
+    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);
+    }
+}
+

 /*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, const wxBitmap& bitmap, long type)
 {
     wxImage img = bitmap.ConvertToImage();
     AddFile(filename, img, type);
 }
 
 /*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, const wxBitmap& bitmap, long type)
 {
     wxImage img = bitmap.ConvertToImage();
     AddFile(filename, img, type);
 }
 

-#endif
+#endif // wxUSE_IMAGE
+
+#endif // wxUSE_GUI

 
 
 #endif // wxUSE_FILESYSTEM && wxUSE_FS_ZIP
 
 
 #endif // wxUSE_FILESYSTEM && wxUSE_FS_ZIP