always let the multiline text control process the Enter key presses

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

diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h
index a24b0dcfcef168923fe6db48b838de81af92d93c..03fa523eee7e3e4eaf26a680cf14451c2b3b90ce 100644 (file)
--- a/include/wx/fs_mem.h
+++ b/include/wx/fs_mem.h
@@ -6,9 +6,11 @@
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 

+#ifndef _WX_FS_MEM_H_
+#define _WX_FS_MEM_H_

 
 #ifdef __GNUG__
 
 #ifdef __GNUG__

-#pragma implementation
+#pragma interface "fs_mem.h"

 #endif
 
 #include "wx/wxprec.h"
 #endif
 
 #include "wx/wxprec.h"


@@ -19,13 +21,12 @@
 
 #if wxUSE_FILESYSTEM
 
 
 #if wxUSE_FILESYSTEM
 

-#ifndef WXPRECOMP
-#include "wx/wx.h"
-#endif
-

 #include "wx/filesys.h"
 #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
 
 //--------------------------------------------------------------------------------
 // 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
 
         // 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, 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);
         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);
         // 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();
         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;
     private:
         static wxHashTable *m_Hash;

-        
+

         static bool CheckHash(const wxString& filename);
 };
 
         static bool CheckHash(const wxString& filename);
 };
 

-#endif 
+#endif

   // wxUSE_FILESYSTEM
 
 
   // wxUSE_FILESYSTEM
 
 

+#endif // _WX_FS_MEM_H_
+