no changes, just remove #if'd out code

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

diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h
index 3749467240b63a30a6827098bb7e2ced603f46b6..8af8773a59d7f15a25c0cd2ccd12c9b691cc5db4 100644 (file)
--- a/include/wx/iconbndl.h
+++ b/include/wx/iconbndl.h
@@ -12,58 +12,100 @@
 #ifndef _WX_ICONBNDL_H_
 #define _WX_ICONBNDL_H_
 
-#include "wx/dynarray.h"
+#include "wx/gdiobj.h"
 // for wxSize
 #include "wx/gdicmn.h"
+#include "wx/icon.h"
+
+#include "wx/dynarray.h"
 
-class WXDLLIMPEXP_CORE wxIcon;
-class WXDLLIMPEXP_BASE wxString;
+class WXDLLIMPEXP_FWD_BASE wxInputStream;
 
-WX_DECLARE_EXPORTED_OBJARRAY( wxIcon, wxIconArray );
+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
-class WXDLLEXPORT wxIconBundle
+class WXDLLIMPEXP_CORE wxIconBundle : public wxGDIObject
 {
 public:
     // default constructor
-    wxIconBundle() : m_icons() {}
+    wxIconBundle();
+
     // initializes the bundle with the icon(s) found in the file
-    wxIconBundle( const wxString& file, long type ) : m_icons()
-        { AddIcon( file, type ); }
-    // initializes the bundle with a single icon
-    wxIconBundle( const wxIcon& icon ) : m_icons()
-        { AddIcon( icon ); }
+    wxIconBundle(const wxString& file, wxBitmapType type = wxBITMAP_TYPE_ANY);
+#if wxUSE_STREAMS
+    wxIconBundle(wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY);
+#endif
 
-    const wxIconBundle& operator =( const wxIconBundle& ic );
-    wxIconBundle( const wxIconBundle& ic ) : m_icons()
-        { *this = ic; }
+    // initializes the bundle with a single icon
+    wxIconBundle(const wxIcon& icon);
 
-    ~wxIconBundle() { DeleteIcons(); }
+    // default copy ctor and assignment operator are OK
 
     // 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, long 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
     // replaced
-    void AddIcon( const wxIcon& icon );
+    void AddIcon(const wxIcon& icon);
 
     // returns the icon with the given size; if no such icon exists,
     // returns the icon with size wxSYS_ICON_[XY]; if no such icon exists,
     // returns the first icon in the bundle
-    const wxIcon& GetIcon( const wxSize& size ) const;
-    // equivalent to GetIcon( wxSize( size, size ) )
-    const wxIcon& GetIcon( wxCoord size = wxDefaultCoord ) const
-        { return GetIcon( wxSize( size, size ) ); }
+    wxIcon GetIcon(const wxSize& size) const;
+
+    // equivalent to GetIcon(wxSize(size, size))
+    wxIcon GetIcon(wxCoord size = wxDefaultCoord) const
+        { return GetIcon(wxSize(size, size)); }
+
+    // returns the icon exactly of the specified size or wxNullIcon if no icon
+    // of exactly given size are available
+    wxIcon GetIconOfExactSize(const wxSize& size) const;
+    wxIcon GetIconOfExactSize(wxCoord size) const
+        { return GetIconOfExactSize(wxSize(size, size)); }
+
+    // enumerate all icons in the bundle: don't use these functions if ti can
+    // be avoided, using GetIcon() directly is better
+
+    // return the number of available icons
+    size_t GetIconCount() const;
+
+    // return the icon at index (must be < GetIconCount())
+    wxIcon GetIconByIndex(size_t n) const;
+
+    // check if we have any icons at all
+    bool IsEmpty() const { return GetIconCount() == 0; }
+
+#if WXWIN_COMPATIBILITY_2_8
+    wxDEPRECATED( void AddIcon(const wxString& file, long type)
+        {
+            AddIcon(file, (wxBitmapType)type);
+        }
+    )
+
+    wxDEPRECATED_CONSTRUCTOR( wxIconBundle (const wxString& file, long type)
+        {
+            AddIcon(file, (wxBitmapType)type);
+        }
+    )
+#endif // WXWIN_COMPATIBILITY_2_8
+
+protected:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+
 private:
     // delete all icons
     void DeleteIcons();
-public:
-    wxIconArray m_icons;
+
+    DECLARE_DYNAMIC_CLASS(wxIconBundle)
 };
 
-#endif
-    // _WX_ICONBNDL_H_
+#endif // _WX_ICONBNDL_H_