added missing wxImageList::Add methods

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h
index 60f0c5d8e306fe182dbfbe9a853a3daf8441b6c0..e65e1787c764957eaf5bfd54fa30421c419e27d0 100644 (file)
--- a/include/wx/generic/imaglist.h
+++ b/include/wx/generic/imaglist.h
@@ -58,7 +58,9 @@ class wxImageList: public wxObject
     ~wxImageList();
     bool Create();
     int GetImageCount() const;
     ~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 );
     const wxBitmap *GetBitmap(int index) const;
     bool Replace( int index, const wxBitmap &bitmap );
     bool Remove( int index );

diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index 403cd4f13c8fc66369d49f38dade6c5eae7e6c89..92d7369c708ba193b40a5a111475b81f77e1501e 100644 (file)
--- a/src/generic/imaglist.cpp
+++ b/src/generic/imaglist.cpp
@@ -20,6 +20,7 @@
 
 #include "wx/generic/imaglist.h"
 #include "wx/icon.h"
 
 #include "wx/generic/imaglist.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
 {
     wxNode *node = m_images.Nth( index );
 const wxBitmap *wxImageList::GetBitmap( int index ) const
 {
     wxNode *node = m_images.Nth( index );