define wxHAS_CONFIG_TEMPLATE_RW if template wxConfig::Read/Write() are available...

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

diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h
index 29a00000b5a7c8b569da7ed7c964a0de35d1808f..f2161aff35876baf32eff5c7402ea68a4799128e 100644 (file)
--- a/include/wx/iconbndl.h
+++ b/include/wx/iconbndl.h
@@ -12,17 +12,11 @@
 #ifndef _WX_ICONBNDL_H_
 #define _WX_ICONBNDL_H_
 
 #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/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;
-

 WX_DECLARE_EXPORTED_OBJARRAY(wxIcon, wxIconArray);
 
 // this class can't load bitmaps of type wxBITMAP_TYPE_ICO_RESOURCE,
 WX_DECLARE_EXPORTED_OBJARRAY(wxIcon, wxIconArray);
 
 // this class can't load bitmaps of type wxBITMAP_TYPE_ICO_RESOURCE,


@@ -40,12 +34,7 @@ public:
     // initializes the bundle with a single icon
     wxIconBundle(const wxIcon& icon);
 
     // 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
 
     // adds all the icons contained in the file to the collection,
     // if the collection already contains icons with the same


@@ -84,14 +73,14 @@ public:
     // check if we have any icons at all
     bool IsEmpty() const { return GetIconCount() == 0; }
 
     // 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)
         {
     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);
         }
         {
             AddIcon(file, (wxBitmapType)type);
         }