X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/43543d985b04d065178df50dbbc998786ff97282..0a816d95815bc4b77f860e88e8f12bf3e9adab10:/src/generic/imaglist.cpp

diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index 87eb78dcd3..12f621afce 100644
--- a/src/generic/imaglist.cpp
+++ b/src/generic/imaglist.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        imaglist.cpp
+// Name:        generic/imaglist.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -20,6 +20,7 @@
 
 #include "wx/generic/imaglist.h"
 #include "wx/icon.h"
+#include "wx/image.h"
 
 //-----------------------------------------------------------------------------
 //  wxImageList
@@ -27,11 +28,9 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject)
 
-wxImageList::wxImageList( int width, int height, bool WXUNUSED(mask), int WXUNUSED(initialCount) )
+wxImageList::wxImageList( int width, int height, bool mask, int initialCount )
 {
-    m_width = width;
-    m_height = height;
-    Create();
+    (void)Create(width, height, mask, initialCount);
 }
 
 wxImageList::~wxImageList()
@@ -43,6 +42,14 @@ int wxImageList::GetImageCount() const
     return m_images.Number();
 }
 
+bool wxImageList::Create( int width, int height, bool WXUNUSED(mask), int WXUNUSED(initialCount) )
+{
+    m_width = width;
+    m_height = height;
+
+    return Create();
+}
+
 bool wxImageList::Create()
 {
     m_images.DeleteContents( TRUE );
@@ -58,6 +65,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 );
@@ -80,7 +101,7 @@ bool wxImageList::Replace( int index, const wxBitmap &bitmap )
 //so construct it from a bitmap object until I can figure this nonsense out. (DW)
         newBitmap = new wxBitmap(bitmap) ;
 #else
-        newBitmap = new wxIcon( (const wxIcon&) bitmap );
+        newBitmap = new wxBitmap( (const wxIcon&) bitmap );
 #endif
     else
         newBitmap = new wxBitmap(bitmap) ;