From: Vadim Zeitlin Date: Tue, 4 Nov 2008 01:42:33 +0000 (+0000) Subject: fix wxXPMDataHandler silently broken by long->wxBitmapType change X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/85d98dfe881b75bd9a4653ab21656bd4149dc507 fix wxXPMDataHandler silently broken by long->wxBitmapType change git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp index 5f9df2b7e2..ec233b0c93 100644 --- a/src/x11/bitmap.cpp +++ b/src/x11/bitmap.cpp @@ -1427,25 +1427,25 @@ public: virtual bool LoadFile(wxBitmap *WXUNUSED(bitmap), const wxString& WXUNUSED(name), - long WXUNUSED(flags), + wxBitmapType WXUNUSED(flags), int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight)) { return false; } virtual bool SaveFile(const wxBitmap *WXUNUSED(bitmap), const wxString& WXUNUSED(name), - int WXUNUSED(type), + wxBitmapType WXUNUSED(type), const wxPalette *WXUNUSED(palette) = NULL) { 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); }; IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler) bool wxXPMDataHandler::Create(wxBitmap *bitmap, const void* bits, - long WXUNUSED(flags), + wxBitmapType WXUNUSED(flags), int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(depth)) { #if wxHAVE_LIB_XPM