Correct wxImage::Size() again; add unit tests for it.

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

diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h
index c3f50a170fe51b8d53d1abc8ab41194e9413182b..3bc91fc5962903dd1c532402add123fa5506795e 100644 (file)
--- a/include/wx/iconbndl.h
+++ b/include/wx/iconbndl.h
@@ -13,10 +13,15 @@
 #define _WX_ICONBNDL_H_
 
 #include "wx/gdiobj.h"
 #define _WX_ICONBNDL_H_
 
 #include "wx/gdiobj.h"

-// for wxSize
-#include "wx/gdicmn.h"
+#include "wx/gdicmn.h"      // for wxSize

 #include "wx/icon.h"
 
 #include "wx/icon.h"
 

+#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,
 // 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


@@ -27,7 +32,10 @@ public:
     wxIconBundle();
 
     // initializes the bundle with the icon(s) found in the file
     wxIconBundle();
 
     // initializes the bundle with the icon(s) found in the file

-    wxIconBundle(const wxString& file, wxBitmapType type);
+#if wxUSE_STREAMS
+    wxIconBundle(const wxString& file, wxBitmapType type = wxBITMAP_TYPE_ANY);
+    wxIconBundle(wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY);
+#endif // wxUSE_STREAMS

 
     // initializes the bundle with a single icon
     wxIconBundle(const wxIcon& icon);
 
     // initializes the bundle with a single icon
     wxIconBundle(const wxIcon& icon);


@@ -37,7 +45,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
     // 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);
+#if wxUSE_STREAMS
+    void AddIcon(const wxString& file, wxBitmapType type = wxBITMAP_TYPE_ANY);
+    void AddIcon(wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY);
+#endif // wxUSE_STREAMS

 
     // adds the icon to the collection, if the collection already
     // contains an icon with the same width and height, it is
 
     // adds the icon to the collection, if the collection already
     // contains an icon with the same width and height, it is


@@ -78,7 +89,7 @@ public:
         }
     )
 
         }
     )
 

-    wxDEPRECATED( wxIconBundle(const wxString& file, long type)
+    wxDEPRECATED_CONSTRUCTOR( wxIconBundle (const wxString& file, long type)

         {
             AddIcon(file, (wxBitmapType)type);
         }
         {
             AddIcon(file, (wxBitmapType)type);
         }