X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cee875e32996e5c5eb8b788cfe84e2bf2a078f53..4f04a4fd782128f16136aabe9eb6c654b2a103a8:/include/wx/iconbndl.h diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h index 8af8773a59..a1082d710b 100644 --- a/include/wx/iconbndl.h +++ b/include/wx/iconbndl.h @@ -13,8 +13,7 @@ #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" @@ -33,10 +32,10 @@ public: wxIconBundle(); // initializes the bundle with the icon(s) found in the file +#if wxUSE_STREAMS && wxUSE_IMAGE wxIconBundle(const wxString& file, wxBitmapType type = wxBITMAP_TYPE_ANY); -#if wxUSE_STREAMS wxIconBundle(wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY); -#endif +#endif // wxUSE_STREAMS && wxUSE_IMAGE // initializes the bundle with a single icon wxIconBundle(const wxIcon& icon); @@ -46,10 +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 +#if wxUSE_STREAMS && wxUSE_IMAGE void AddIcon(const wxString& file, wxBitmapType type = wxBITMAP_TYPE_ANY); -#if wxUSE_STREAMS void AddIcon(wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY); -#endif +#endif // wxUSE_STREAMS && wxUSE_IMAGE // adds the icon to the collection, if the collection already // contains an icon with the same width and height, it is