X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f884a0dccd6b642f35c441ac9bfc87a6d5b4d35..1154f91b6a4590d4fda9e4cef75aa4ff35ca57bc:/include/wx/iconbndl.h diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h index 1892c30a1c..1f0747547d 100644 --- a/include/wx/iconbndl.h +++ b/include/wx/iconbndl.h @@ -28,14 +28,14 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxIcon, wxIconArray); // this class can't load bitmaps of type wxBITMAP_TYPE_ICO_RESOURCE, // if you need them, you have to load them manually and call // wxIconCollection::AddIcon -class WXDLLEXPORT wxIconBundle : public wxGDIObject +class WXDLLIMPEXP_CORE wxIconBundle : public wxGDIObject { public: // default constructor wxIconBundle(); // initializes the bundle with the icon(s) found in the file - wxIconBundle(const wxString& file, long type); + wxIconBundle(const wxString& file, wxBitmapType type); // initializes the bundle with a single icon wxIconBundle(const wxIcon& icon); @@ -50,7 +50,7 @@ public: // adds all the icons contained in the file to the collection, // if the collection already contains icons with the same // width and height, they are replaced - void AddIcon(const wxString& file, long type); + void AddIcon(const wxString& file, wxBitmapType type); // adds the icon to the collection, if the collection already // contains an icon with the same width and height, it is @@ -84,6 +84,20 @@ public: // check if we have any icons at all bool IsEmpty() const { return GetIconCount() == 0; } +#if WXWIN_COMPATIBILITY_2_8 + wxDEPRECATED( void AddIcon(const wxString& file, long type) + { + AddIcon(file, (wxBitmapType)type); + } + ) + + wxDEPRECATED( wxIconBundle(const wxString& file, long type) + { + AddIcon(file, (wxBitmapType)type); + } + ) +#endif // WXWIN_COMPATIBILITY_2_8 + protected: virtual wxGDIRefData *CreateGDIRefData() const; virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;