move virtual GetPath() implementation out of line to work around an apparent Fedora...

[wxWidgets.git] / include / wx / iconbndl.h

diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h
index f32db6f3e3ad48bc5cd03dc3904dee41a067c4c8..8af8773a59d7f15a25c0cd2ccd12c9b691cc5db4 100644 (file)
--- a/include/wx/iconbndl.h
+++ b/include/wx/iconbndl.h
@@ -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