We need a char, not wxChar.

[wxWidgets.git] / src / common / fs_mem.cpp

diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index 782b95d758e608c98088e5862ad048233db07c09..aa59f1b48ce16364649f983c1d8d22ffd225ce17 100644 (file)
--- a/src/common/fs_mem.cpp
+++ b/src/common/fs_mem.cpp
@@ -3,13 +3,13 @@
 // 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

 /////////////////////////////////////////////////////////////////////////////
 
 
 #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).


@@ -79,7 +79,7 @@ class MemFSHashObj : public wxObject
         {
 #if wxUSE_DATETIME
             m_Time = wxDateTime::Now();
         {
 #if wxUSE_DATETIME
             m_Time = wxDateTime::Now();

-#endif // wxUSE_DATETIME            
+#endif // wxUSE_DATETIME

         }
 };
 
         }
 };
 


@@ -137,7 +137,7 @@ wxFSFile* wxMemoryFSHandlerBase::OpenFile(wxFileSystem& WXUNUSED(fs), const wxSt
                             GetAnchor(location)
 #if wxUSE_DATETIME
                             , obj -> m_Time
                             GetAnchor(location)
 #if wxUSE_DATETIME
                             , obj -> m_Time

-#endif // wxUSE_DATETIME                            
+#endif // wxUSE_DATETIME

                             );
     }
     else return NULL;
                             );
     }
     else return NULL;


@@ -175,10 +175,10 @@ bool wxMemoryFSHandlerBase::CheckHash(const wxString& filename)
         wxString s;
         s.Printf(_("Memory VFS already contains file '%s'!"), filename.c_str());
         wxLogError(s);
         wxString s;
         s.Printf(_("Memory VFS already contains file '%s'!"), filename.c_str());
         wxLogError(s);

-        return FALSE;
+        return false;

     }
     else
     }
     else

-        return TRUE;
+        return true;

 }
 
 
 }
 
 


@@ -216,7 +216,9 @@ bool wxMemoryFSHandlerBase::CheckHash(const wxString& filename)
 
 #if wxUSE_IMAGE
 /*static*/ void
 
 #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;
 
 {
     if (!CheckHash(filename)) return;
 


@@ -232,7 +234,10 @@ wxMemoryFSHandler::AddFile(const wxString& filename, wxImage& image, long type)
     }
 }
 
     }
 }
 

-/*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);
 {
     wxImage img = bitmap.ConvertToImage();
     AddFile(filename, img, type);