Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix wxXPMDataHandler silently broken by long->wxBitmapType change

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-11-04 01:42:33 +00:00
parent 0e0d3ae110
commit 85d98dfe88
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/x11/bitmap.cpp
View File

@@ -1427,25 +1427,25 @@ public:
virtual bool LoadFile(wxBitmap *WXUNUSED(bitmap), virtual bool LoadFile(wxBitmap *WXUNUSED(bitmap),
const wxString& WXUNUSED(name), const wxString& WXUNUSED(name),
long WXUNUSED(flags), wxBitmapType WXUNUSED(flags),
int WXUNUSED(desiredWidth), int WXUNUSED(desiredWidth),
int WXUNUSED(desiredHeight)) int WXUNUSED(desiredHeight))
{ return false; } { return false; }
virtual bool SaveFile(const wxBitmap *WXUNUSED(bitmap), virtual bool SaveFile(const wxBitmap *WXUNUSED(bitmap),
const wxString& WXUNUSED(name), const wxString& WXUNUSED(name),
int WXUNUSED(type), wxBitmapType WXUNUSED(type),
const wxPalette *WXUNUSED(palette) = NULL) const wxPalette *WXUNUSED(palette) = NULL)
{ return false; } { return false; }
virtual bool Create(wxBitmap *bitmap, const void* data, long flags, virtual bool Create(wxBitmap *bitmap, const void* data, wxBitmapType flags,
int width, int height, int depth = 1); int width, int height, int depth = 1);
}; };
IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler) IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler)
bool wxXPMDataHandler::Create(wxBitmap *bitmap, const void* bits, bool wxXPMDataHandler::Create(wxBitmap *bitmap, const void* bits,
long WXUNUSED(flags), wxBitmapType WXUNUSED(flags),
int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(depth)) int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(depth))
{ {
#if wxHAVE_LIB_XPM #if wxHAVE_LIB_XPM