From: Paul Cornett Date: Tue, 26 Aug 2008 16:34:22 +0000 (+0000) Subject: put wxIconArray back in header, it's used by wxFSVolume X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d2cb636a1f81e4a1364559cca7e8179faa85f7a2 put wxIconArray back in header, it's used by wxFSVolume git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h index c3f50a170f..e7db074bad 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 diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp index 60e92d558d..a67762962e 100644 --- a/src/common/iconbndl.cpp +++ b/src/common/iconbndl.cpp @@ -25,7 +25,6 @@ #include "wx/image.h" #endif -WX_DECLARE_EXPORTED_OBJARRAY(wxIcon, wxIconArray); #include "wx/arrimpl.cpp" WX_DEFINE_OBJARRAY(wxIconArray)