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
This commit is contained in:
parent
6ad7799c0b
commit
9e0560c1bc
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user