X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7105649b88e11ec4531440632cffe7fb6f18f39c..32cdc45397d8c0a24735f84e1dcf83bba1980f2d:/include/wx/iconbndl.h diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h index f32db6f3e3..3bc91fc596 100644 --- a/include/wx/iconbndl.h +++ b/include/wx/iconbndl.h @@ -13,12 +13,13 @@ #define _WX_ICONBNDL_H_ #include "wx/gdiobj.h" -// for wxSize -#include "wx/gdicmn.h" +#include "wx/gdicmn.h" // for wxSize #include "wx/icon.h" #include "wx/dynarray.h" +class WXDLLIMPEXP_FWD_BASE wxInputStream; + WX_DECLARE_EXPORTED_OBJARRAY(wxIcon, wxIconArray); // this class can't load bitmaps of type wxBITMAP_TYPE_ICO_RESOURCE, @@ -31,7 +32,10 @@ public: wxIconBundle(); // initializes the bundle with the icon(s) found in the file - wxIconBundle(const wxString& file, wxBitmapType type); +#if wxUSE_STREAMS + wxIconBundle(const wxString& file, wxBitmapType type = wxBITMAP_TYPE_ANY); + wxIconBundle(wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY); +#endif // wxUSE_STREAMS // initializes the bundle with a single icon wxIconBundle(const wxIcon& icon); @@ -41,7 +45,10 @@ 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, wxBitmapType type); +#if wxUSE_STREAMS + void AddIcon(const wxString& file, wxBitmapType type = wxBITMAP_TYPE_ANY); + void AddIcon(wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY); +#endif // wxUSE_STREAMS // adds the icon to the collection, if the collection already // contains an icon with the same width and height, it is