X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0ddec397f6260193b517ee48f035c1f2ec3c5c2d..44c87b7d15d5c1f5926beffa4cd5c9d1d2045e04:/include/wx/iconbndl.h

diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h
index 29a00000b5..f32db6f3e3 100644
--- a/include/wx/iconbndl.h
+++ b/include/wx/iconbndl.h
@@ -12,16 +12,12 @@
 #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"
 
-class WXDLLIMPEXP_FWD_CORE wxIcon;
-class WXDLLIMPEXP_FWD_BASE wxString;
-
-class WXDLLIMPEXP_FWD_CORE wxIconBundle;
+#include "wx/dynarray.h"
 
 WX_DECLARE_EXPORTED_OBJARRAY(wxIcon, wxIconArray);
 
@@ -40,12 +36,7 @@ public:
     // initializes the bundle with a single icon
     wxIconBundle(const wxIcon& icon);
 
-    // initializes the bundle from another icon bundle
-    wxIconBundle(const wxIconBundle& icon);
-
-    wxIconBundle& operator=(const wxIconBundle& ic)
-        { if ( this != &ic) Ref(ic); return *this; }
-
+    // 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
@@ -84,14 +75,14 @@ public:
     // check if we have any icons at all
     bool IsEmpty() const { return GetIconCount() == 0; }
 
-#ifdef WXWIN_COMPATIBILITY_2_8
+#if WXWIN_COMPATIBILITY_2_8
     wxDEPRECATED( void AddIcon(const wxString& file, long type)
         {
-            AddIcon(file, (long)type);
+            AddIcon(file, (wxBitmapType)type);
         }
     )
 
-    wxDEPRECATED( wxIconBundle(const wxString& file, long type)
+    wxDEPRECATED_CONSTRUCTOR( wxIconBundle (const wxString& file, long type)
         {
             AddIcon(file, (wxBitmapType)type);
         }