X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..ed7c11abc829a8f7becc92ee438866e36f2216fe:/src/common/fs_mem.cpp

diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index 7fd1569990..aa59f1b48c 100644
--- a/src/common/fs_mem.cpp
+++ b/src/common/fs_mem.cpp
@@ -3,11 +3,18 @@
 // Purpose:     in-memory file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#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
 
@@ -72,7 +79,7 @@ class MemFSHashObj : public wxObject
         {
 #if wxUSE_DATETIME
             m_Time = wxDateTime::Now();
-#endif // wxUSE_DATETIME            
+#endif // wxUSE_DATETIME
         }
 };
 
@@ -130,7 +137,7 @@ wxFSFile* wxMemoryFSHandlerBase::OpenFile(wxFileSystem& WXUNUSED(fs), const wxSt
                             GetAnchor(location)
 #if wxUSE_DATETIME
                             , obj -> m_Time
-#endif // wxUSE_DATETIME                            
+#endif // wxUSE_DATETIME
                             );
     }
     else return NULL;
@@ -168,10 +175,10 @@ bool wxMemoryFSHandlerBase::CheckHash(const wxString& filename)
         wxString s;
         s.Printf(_("Memory VFS already contains file '%s'!"), filename.c_str());
         wxLogError(s);
-        return FALSE;
+        return false;
     }
     else
-        return TRUE;
+        return true;
 }
 
 
@@ -209,7 +216,9 @@ bool wxMemoryFSHandlerBase::CheckHash(const wxString& filename)
 
 #if wxUSE_IMAGE
 /*static*/ void
-wxMemoryFSHandler::AddFile(const wxString& filename, wxImage& image, long type)
+wxMemoryFSHandler::AddFile(const wxString& filename,
+                           const wxImage& image,
+                           long type)
 {
     if (!CheckHash(filename)) return;
 
@@ -224,15 +233,19 @@ 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)
+/*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