X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/24af522c4378db219f13146f8bfe22fe790aad0f..f4bc1aa27cb33f679d7e9c1518a7855bbc1fa471:/include/wx/iconbndl.h diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h index c3f50a170f..75aa51c653 100644 --- a/include/wx/iconbndl.h +++ b/include/wx/iconbndl.h @@ -17,6 +17,8 @@ #include "wx/gdicmn.h" #include "wx/icon.h" +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 @@ -77,8 +79,9 @@ public: AddIcon(file, (wxBitmapType)type); } ) - - wxDEPRECATED( wxIconBundle(const wxString& file, long type) + // explicitly specifying inline allows gcc < 3.4 to + // handle the deprecation attribute even in the constructor. + wxDEPRECATED( inline wxIconBundle (const wxString& file, long type) { AddIcon(file, (wxBitmapType)type); }