post wxUniv merge fixes

[wxWidgets.git] / src / generic / imaglist.cpp

diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index 87eb78dcd396427fdcff605a64c91f0cf12dc3b9..12f621afce17934a1027001e00b83544209eee3a 100644 (file)
--- 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
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -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


@@ -27,11 +28,9 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject)
 
 
 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()
 }
 
 wxImageList::~wxImageList()


@@ -43,6 +42,14 @@ int wxImageList::GetImageCount() const
     return m_images.Number();
 }
 
     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 );
 bool wxImageList::Create()
 {
     m_images.DeleteContents( TRUE );


@@ -58,6 +65,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 );


@@ -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
 //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) ;
 #endif
     else
         newBitmap = new wxBitmap(bitmap) ;