added missing wxImageList::Add methods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -58,7 +58,9 @@ class wxImageList: public wxObject
|
||||
~wxImageList();
|
||||
bool Create();
|
||||
int GetImageCount() const;
|
||||
int Add( const wxBitmap &bitmap );
|
||||
int Add( const wxBitmap& bitmap );
|
||||
int Add( const wxBitmap& bitmap, const wxBitmap& mask );
|
||||
int Add( const wxBitmap& bitmap, const wxColour& maskColour );
|
||||
const wxBitmap *GetBitmap(int index) const;
|
||||
bool Replace( int index, const wxBitmap &bitmap );
|
||||
bool Remove( int index );
|
||||
|
@@ -20,6 +20,7 @@
|
||||
|
||||
#include "wx/generic/imaglist.h"
|
||||
#include "wx/icon.h"
|
||||
#include "wx/image.h"
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxImageList
|
||||
@@ -58,6 +59,20 @@ int wxImageList::Add( const wxBitmap &bitmap )
|
||||
return m_images.Number()-1;
|
||||
}
|
||||
|
||||
int wxImageList::Add( const wxBitmap& bitmap, const wxBitmap& mask )
|
||||
{
|
||||
wxBitmap bmp(bitmap);
|
||||
bmp.SetMask(new wxMask(mask));
|
||||
return Add(bmp);
|
||||
}
|
||||
|
||||
int wxImageList::Add( const wxBitmap& bitmap, const wxColour& maskColour )
|
||||
{
|
||||
wxImage img(bitmap);
|
||||
img.SetMaskColour(maskColour.Red(), maskColour.Green(), maskColour.Blue());
|
||||
return Add(img.ConvertToBitmap());
|
||||
}
|
||||
|
||||
const wxBitmap *wxImageList::GetBitmap( int index ) const
|
||||
{
|
||||
wxNode *node = m_images.Nth( index );
|
||||
|
Reference in New Issue
Block a user