add support for loading wxIconBundles from streams

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2009-03-29 21:19:40 +00:00
parent 694cb6c581
commit cee875e329
3 changed files with 88 additions and 28 deletions

View File

@@ -19,6 +19,8 @@
#include "wx/dynarray.h"
class WXDLLIMPEXP_FWD_BASE wxInputStream;
WX_DECLARE_EXPORTED_OBJARRAY(wxIcon, wxIconArray);
// this class can't load bitmaps of type wxBITMAP_TYPE_ICO_RESOURCE,
@@ -31,7 +33,10 @@ public:
wxIconBundle();
// initializes the bundle with the icon(s) found in the file
wxIconBundle(const wxString& file, wxBitmapType type);
wxIconBundle(const wxString& file, wxBitmapType type = wxBITMAP_TYPE_ANY);
#if wxUSE_STREAMS
wxIconBundle(wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY);
#endif
// initializes the bundle with a single icon
wxIconBundle(const wxIcon& icon);
@@ -41,7 +46,10 @@ public:
// adds all the icons contained in the file to the collection,
// if the collection already contains icons with the same
// width and height, they are replaced
void AddIcon(const wxString& file, wxBitmapType type);
void AddIcon(const wxString& file, wxBitmapType type = wxBITMAP_TYPE_ANY);
#if wxUSE_STREAMS
void AddIcon(wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY);
#endif
// adds the icon to the collection, if the collection already
// contains an icon with the same width and height, it is