AddFile(wxImage&) -> AddFile(const wxImage&)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h
index 3a89e19e1b50f7e201a221f4874cc01542bc85cb..90709673262bd322030aac4441d456f590eb8b22 100644 (file)
--- a/include/wx/fs_mem.h
+++ b/include/wx/fs_mem.h
@@ -90,7 +90,9 @@ public:
     }
 
 #if wxUSE_IMAGE
     }
 
 #if wxUSE_IMAGE

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

 
     static void AddFile(const wxString& filename,
                         const wxBitmap& bitmap,
 
     static void AddFile(const wxString& filename,
                         const wxBitmap& bitmap,

diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index 8e77fde518d08b2d835e08dff87bd72cf8763e40..de45ca8b96ac7826bcb8071ebe0d7cf26ff7d99b 100644 (file)
--- a/src/common/fs_mem.cpp
+++ b/src/common/fs_mem.cpp
@@ -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);