X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e98e625cbbe269f109b2296a045a657cba00fede..4f2511d706e5274a34e1521e11c1b95fed735b42:/include/wx/iconbndl.h diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h index f01293ca75..e7db074bad 100644 --- a/include/wx/iconbndl.h +++ b/include/wx/iconbndl.h @@ -12,17 +12,11 @@ #ifndef _WX_ICONBNDL_H_ #define _WX_ICONBNDL_H_ -#include "wx/dynarray.h" #include "wx/gdiobj.h" // for wxSize #include "wx/gdicmn.h" #include "wx/icon.h" -class WXDLLIMPEXP_FWD_CORE wxIcon; -class WXDLLIMPEXP_FWD_BASE wxString; - -class WXDLLIMPEXP_FWD_CORE wxIconBundle; - WX_DECLARE_EXPORTED_OBJARRAY(wxIcon, wxIconArray); // this class can't load bitmaps of type wxBITMAP_TYPE_ICO_RESOURCE, @@ -40,12 +34,7 @@ public: // initializes the bundle with a single icon wxIconBundle(const wxIcon& icon); - // initializes the bundle from another icon bundle - wxIconBundle(const wxIconBundle& icon); - - wxIconBundle& operator=(const wxIconBundle& ic) - { if ( this != &ic) Ref(ic); return *this; } - + // default copy ctor and assignment operator are OK // adds all the icons contained in the file to the collection, // if the collection already contains icons with the same @@ -84,6 +73,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;