Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

put wxIconArray back in header, it's used by wxFSVolume

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2008-08-26 16:34:22 +00:00
parent 9ff9d30c0a
commit d2cb636a1f
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/iconbndl.h
View File

@@ -17,6 +17,8 @@
#include "wx/gdicmn.h" #include "wx/gdicmn.h"
#include "wx/icon.h" #include "wx/icon.h"
WX_DECLARE_EXPORTED_OBJARRAY(wxIcon, wxIconArray);
// this class can't load bitmaps of type wxBITMAP_TYPE_ICO_RESOURCE, // this class can't load bitmaps of type wxBITMAP_TYPE_ICO_RESOURCE,
// if you need them, you have to load them manually and call // if you need them, you have to load them manually and call
// wxIconCollection::AddIcon // wxIconCollection::AddIcon

1
src/common/iconbndl.cpp
View File

@@ -25,7 +25,6 @@
#include "wx/image.h" #include "wx/image.h"
#endif #endif
WX_DECLARE_EXPORTED_OBJARRAY(wxIcon, wxIconArray);
#include "wx/arrimpl.cpp" #include "wx/arrimpl.cpp"
WX_DEFINE_OBJARRAY(wxIconArray) WX_DEFINE_OBJARRAY(wxIconArray)