X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..1dff2537d37a4c8f3424d8c2cd3a921c72badb01:/include/wx/iconbndl.h diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h index c52c984d8a..1f0747547d 100644 --- a/include/wx/iconbndl.h +++ b/include/wx/iconbndl.h @@ -35,7 +35,7 @@ public: 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;