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

added missing wxImageList::Add methods

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2000-03-05 14:15:47 +00:00
parent 4767810533
commit 4d44947336
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/generic/imaglist.h
View File

@@ -58,7 +58,9 @@ class wxImageList: public wxObject
~wxImageList(); ~wxImageList();
bool Create(); bool Create();
int GetImageCount() const; 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; const wxBitmap *GetBitmap(int index) const;
bool Replace( int index, const wxBitmap &bitmap ); bool Replace( int index, const wxBitmap &bitmap );
bool Remove( int index ); bool Remove( int index );

15
src/generic/imaglist.cpp
View File

@@ -20,6 +20,7 @@
#include "wx/generic/imaglist.h" #include "wx/generic/imaglist.h"
#include "wx/icon.h" #include "wx/icon.h"
#include "wx/image.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxImageList // wxImageList
@@ -58,6 +59,20 @@ int wxImageList::Add( const wxBitmap &bitmap )
return m_images.Number()-1; 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 const wxBitmap *wxImageList::GetBitmap( int index ) const
{ {
wxNode *node = m_images.Nth( index ); wxNode *node = m_images.Nth( index );