From 9e0560c1bcf545df2fb3093ac653f2c53e11cc6d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 24 Jun 2008 23:43:59 +0000 Subject: [PATCH] provide deprectaed LoadFile() and FindHandler() overloads taking long, otherwise the existing code using long instead of wxBitmapType doesn't compile because of the ambiguity between long->wxBitmapType and long->wxString conversions (as these methods are also overloaded to take wxString) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/image.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/include/wx/image.h b/include/wx/image.h index 60aff69ce6..11e835c312 100644 --- a/include/wx/image.h +++ b/include/wx/image.h @@ -417,6 +417,7 @@ public: static wxImageHandler *FindHandler( const wxString& name ); static wxImageHandler *FindHandler( const wxString& extension, wxBitmapType imageType ); static wxImageHandler *FindHandler( wxBitmapType imageType ); + static wxImageHandler *FindHandlerMime( const wxString& mimetype ); static wxString GetImageExtWildcard(); @@ -427,6 +428,21 @@ public: static HSVValue RGBtoHSV(const RGBValue& rgb); static RGBValue HSVtoRGB(const HSVValue& hsv); +#ifdef WXWIN_COMPATIBILITY_2_8 + wxDEPRECATED( + bool LoadFile(const wxString& name, long type, int index = -1) + { + return LoadFile(name, (wxBitmapType)type, index); + } + ) + + wxDEPRECATED( + static wxImageHandler *FindHandler(long imageType) + { + return FindHandler((wxBitmapType)imageType); + } + ) +#endif // WXWIN_COMPATIBILITY_2_8 protected: static wxList sm_handlers; -- 2.45.2