move wxIconArray declaration out of header, remove unneccessary copy ctor and assignment operator

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2008-08-26 06:34:34 +00:00
parent 05e0b047d8
commit 24af522c43
2 changed files with 3 additions and 37 deletions

View File

@@ -12,19 +12,11 @@
#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;
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
@@ -40,12 +32,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