1. added wxGTK::wxToolBar::SetToolShortHelp() and test for it in sample

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

diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h
index a24b0dcfcef168923fe6db48b838de81af92d93c..f85dd29f39f6a753e2b40a7a3c25e355f5fbe25b 100644 (file)
--- a/include/wx/fs_mem.h
+++ b/include/wx/fs_mem.h
@@ -24,8 +24,10 @@
 #endif
 
 #include "wx/filesys.h"
 #endif
 
 #include "wx/filesys.h"

+#if wxUSE_GUI

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

+#endif

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


@@ -39,8 +41,10 @@ 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);

+#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 wxString& textdata);        
         static void AddFile(const wxString& filename, const void *binarydata, size_t size);