X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/23324ae1c7938ba904770fc456d3c07764b9c5e9..731330ec4c570f1c000a8b39fc27f136e7ab1d11:/interface/iconbndl.h

diff --git a/interface/iconbndl.h b/interface/iconbndl.h
index 031e4f79c4..8532db9145 100644
--- a/interface/iconbndl.h
+++ b/interface/iconbndl.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        iconbndl.h
-// Purpose:     documentation for wxIconBundle class
+// Purpose:     interface of wxIconBundle
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Licence:     wxWindows license
@@ -9,16 +9,16 @@
 /**
     @class wxIconBundle
     @wxheader{iconbndl.h}
-    
+
     This class contains multiple copies of an icon in different sizes,
     see also wxDialog::SetIcons and
     wxTopLevelWindow::SetIcons.
-    
+
     @library{wxcore}
     @category{FIXME}
-    
+
     @stdobjects
-    wxNullIconBundle
+    ::wxNullIconBundle
 */
 class wxIconBundle : public wxGDIObject
 {
@@ -28,9 +28,9 @@ public:
         Copy constructor.
     */
     wxIconBundle();
-        wxIconBundle(const wxString& file, long type);
-        wxIconBundle(const wxIcon& icon);
-        wxIconBundle(const wxIconBundle& ic);
+    wxIconBundle(const wxString& file, wxBitmapType type);
+    wxIconBundle(const wxIcon& icon);
+    wxIconBundle(const wxIconBundle& ic);
     //@}
 
     /**
@@ -44,30 +44,30 @@ public:
         contains an icon with the same width and height, it is
         replaced by the new one.
     */
-    void AddIcon(const wxString& file, long type);
-        void AddIcon(const wxIcon& icon);
+    void AddIcon(const wxString& file, wxBitmapType type);
+    void AddIcon(const wxIcon& icon);
     //@}
 
     //@{
     /**
         Same as GetIcon( wxSize( size, size ) ).
     */
-    wxIcon GetIcon(const wxSize& size);
-        wxIcon GetIcon(wxCoord size = -1);
+    wxIcon GetIcon(const wxSize& size) const;
+    const wxIcon  GetIcon(wxCoord size = -1) const;
     //@}
 
     /**
         Returns the icon with exactly the given size or @c wxNullIcon if this
         size is not available.
     */
-    wxIcon GetIconOfExactSize(const wxSize& size);
+    wxIcon GetIconOfExactSize(const wxSize& size) const;
 
     /**
         Returns @true if the bundle doesn't contain any icons, @false otherwise (in
         which case a call to GetIcon() with default
         parameter should return a valid icon).
     */
-    bool IsEmpty();
+    bool IsEmpty() const;
 
     /**
         Assignment operator, using @ref overview_trefcount "reference counting".
@@ -79,3 +79,11 @@ public:
     */
     bool operator ==(const wxIconBundle& ic);
 };
+
+
+/**
+    An empty wxIconBundle.
+*/
+wxIconBundle wxNullIconBundle;
+
+