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 c3f50a170fe51b8d53d1abc8ab41194e9413182b..e7db074bad1bcd5c14ad390883a9632a65c8b09c 100644 (file)
--- a/include/wx/iconbndl.h
+++ b/include/wx/iconbndl.h
@@ -17,6 +17,8 @@
 #include "wx/gdicmn.h"
 #include "wx/icon.h"
 
 #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
 // 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 60e92d558d7079918d48a8766465de38c8059b81..a67762962e3a2908475b28de41476562f3d7ea9b 100644 (file)
--- a/src/common/iconbndl.cpp
+++ b/src/common/iconbndl.cpp
@@ -25,7 +25,6 @@
     #include "wx/image.h"
 #endif
 
     #include "wx/image.h"
 #endif
 

-WX_DECLARE_EXPORTED_OBJARRAY(wxIcon, wxIconArray);

 #include "wx/arrimpl.cpp"
 WX_DEFINE_OBJARRAY(wxIconArray)
 
 #include "wx/arrimpl.cpp"
 WX_DEFINE_OBJARRAY(wxIconArray)