Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. changed wxIconBundle to use m_refData and COW to make copying icon bundles

Browse Source 
fast (which was needed for 2)
2. make it possible to return wxIconBundles from wxArtProvider
3. implement Mac-specific wxArtProvider doing (2)

(modified patch 1581960)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-04-07 19:59:51 +00:00
parent 0597e7f977
commit 527343602e
21 changed files with 629 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
include/wx/iconbndl.h
View File

@@ -13,57 +13,80 @@
#define _WX_ICONBNDL_H_
#include "wx/dynarray.h"
#include "wx/gdiobj.h"
// for wxSize
#include "wx/gdicmn.h"
#include "wx/icon.h"
class WXDLLIMPEXP_CORE wxIcon;
class WXDLLIMPEXP_BASE wxString;
WX_DECLARE_EXPORTED_OBJARRAY( wxIcon, wxIconArray );
class WXDLLEXPORT 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
class WXDLLEXPORT wxIconBundle
class WXDLLEXPORT 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 ); }
wxIconBundle(const wxString& file, long type);
// initializes the bundle with a single icon
wxIconBundle( const wxIcon& icon ) : m_icons()
{ AddIcon( icon ); }
wxIconBundle(const wxIcon& icon);
const wxIconBundle& operator =( const wxIconBundle& ic );
wxIconBundle( const wxIconBundle& ic ) : m_icons()
{ *this = ic; }
// initializes the bundle from another icon bundle
wxIconBundle(const wxIconBundle& icon);
wxIconBundle& operator=(const wxIconBundle& ic)
{ if ( this != &ic) Ref(ic); return *this; }
virtual bool IsOk() const;
~wxIconBundle() { DeleteIcons(); }
// 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, long type);
// 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;
wxIcon GetIcon(const wxSize& size) const;
// equivalent to GetIcon( wxSize( size, size ) )
const wxIcon& GetIcon( wxCoord size = wxDefaultCoord ) const
wxIcon GetIcon(wxCoord size = wxDefaultCoord) const
{ return GetIcon( 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;
protected:
virtual wxObjectRefData *CreateRefData() const;
virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
private:
// delete all icons
void DeleteIcons();
public:
wxIconArray m_icons;
DECLARE_DYNAMIC_CLASS(wxIconBundle)
};
#endif
// _WX_ICONBNDL_H_
#endif // _WX_ICONBNDL_H_