Removed redundant wx<Control>NameStr declarations.

[wxWidgets.git] / include / wx / fs_mem.h

diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h
index 61b491fbc11d26cf74d9555e060350a41afe70e1..44cd4d489d8fd619acba014f8fe13d1924b74673 100644 (file)
--- a/include/wx/fs_mem.h
+++ b/include/wx/fs_mem.h
@@ -6,26 +6,27 @@
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
+#ifndef _WX_FS_MEM_H_
+#define _WX_FS_MEM_H_
 
-#ifdef __GNUG__
-#pragma implementation
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "fs_mem.h"
 #endif
 
 #include "wx/wxprec.h"
 
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
-#if (wxUSE_HTML || wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
-
-#ifndef WXPRECOMP
-#include "wx/wx.h"
-#endif
+#if wxUSE_FILESYSTEM
 
 #include "wx/filesys.h"
-#include "wx/image.h"
-#include "wx/bitmap.h"
+
+#if wxUSE_GUI
+    #include "wx/image.h"
+    #include "wx/bitmap.h"
+#endif
 
 //--------------------------------------------------------------------------------
 // wxMemoryFSHandler
@@ -39,26 +40,30 @@ class WXDLLEXPORT wxMemoryFSHandler : public wxFileSystemHandler
 
         // Add file to list of files stored in memory. Stored data (bitmap, text or raw data)
         // will be copied into private memory stream and available under name "memory:" + filename
+#if wxUSE_GUI
         static void AddFile(const wxString& filename, wxImage& image, long type);
         static void AddFile(const wxString& filename, const wxBitmap& bitmap, long type);
-        static void AddFile(const wxString& filename, const wxString& textdata);        
+#endif
+        static void AddFile(const wxString& filename, const wxString& textdata);
         static void AddFile(const wxString& filename, const void *binarydata, size_t size);
-        
+
         // Remove file from memory FS and free occupied memory
         static void RemoveFile(const wxString& filename);
-        
+
         virtual bool CanOpen(const wxString& location);
         virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);
         virtual wxString FindFirst(const wxString& spec, int flags = 0);
         virtual wxString FindNext();
-        
+
     private:
         static wxHashTable *m_Hash;
-        
+
         static bool CheckHash(const wxString& filename);
 };
 
-#endif 
-  // (wxUSE_HTML || wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
+#endif
+  // wxUSE_FILESYSTEM
+
 
+#endif // _WX_FS_MEM_H_