AddFile(wxImage&) -> AddFile(const wxImage&)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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,
|
static void AddFile(const wxString& filename,
|
||||||
const wxBitmap& bitmap,
|
const wxBitmap& bitmap,
|
||||||
|
@@ -216,7 +216,9 @@ bool wxMemoryFSHandlerBase::CheckHash(const wxString& filename)
|
|||||||
|
|
||||||
#if wxUSE_IMAGE
|
#if wxUSE_IMAGE
|
||||||
/*static*/ void
|
/*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();
|
wxImage img = bitmap.ConvertToImage();
|
||||||
AddFile(filename, img, type);
|
AddFile(filename, img, type);
|
||||||
|
Reference in New Issue
Block a user