fixed bug in Set() on DST days (patch 1097811)

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

diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h
index 9a46b264f40b78f6801a0c4ca96ab789d5f28fdc..f7224b7ec767fcebd93c3dbbe39230bb5863b928 100644 (file)
--- a/include/wx/fs_mem.h
+++ b/include/wx/fs_mem.h
@@ -3,7 +3,7 @@
 // Purpose:     in-memory file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 2000 Vaclav Slavik
 // Purpose:     in-memory file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 2000 Vaclav Slavik

-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FS_MEM_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FS_MEM_H_


@@ -11,7 +11,7 @@
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) && !defined(__EMX__)
 // Some older compilers (such as EMX) cannot handle
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) && !defined(__EMX__)
 // Some older compilers (such as EMX) cannot handle

-// #pragma interface/implementation correctly, iff 
+// #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).
 // #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).


@@ -20,11 +20,7 @@
 #pragma interface "fs_mem.h"
 #endif
 
 #pragma interface "fs_mem.h"
 #endif
 

-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
+#include "wx/defs.h"

 
 #if wxUSE_FILESYSTEM
 
 
 #if wxUSE_FILESYSTEM
 


@@ -90,12 +86,15 @@ public:
     }
 
 #if wxUSE_IMAGE
     }
 
 #if wxUSE_IMAGE

-    static void AddFile(const wxString& filename, wxImage& image, long type);
-#endif // wxUSE_IMAGE
+    static void AddFile(const wxString& filename,
+                        const wxImage& image,
+                        long type);

 
     static void AddFile(const wxString& filename,
                         const wxBitmap& bitmap,
                         long type);
 
     static void AddFile(const wxString& filename,
                         const wxBitmap& bitmap,
                         long type);

+#endif // wxUSE_IMAGE
+

 };
 
 #else // !wxUSE_GUI
 };
 
 #else // !wxUSE_GUI