#ifdef __GNUG__
#pragma implementation "imaglist.h"
#endif
-
+
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#pragma hdrstop
#endif
-#include "wx/imaglist.h"
+#include "wx/generic/imaglist.h"
+#include "wx/icon.h"
+#include "wx/image.h"
//-----------------------------------------------------------------------------
// wxImageList
int wxImageList::Add( const wxBitmap &bitmap )
{
- m_images.Append( new wxBitmap(bitmap) );
- return m_images.Number();
+ if (bitmap.IsKindOf(CLASSINFO(wxIcon)))
+ m_images.Append( new wxIcon( (const wxIcon&) bitmap ) );
+ else
+ m_images.Append( new 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
+const wxBitmap *wxImageList::GetBitmap( int index ) const
{
wxNode *node = m_images.Nth( index );
-
- wxCHECK_MSG( node, (wxBitmap *) NULL, "wrong index in image list" );
-
+
+ wxCHECK_MSG( node, (wxBitmap *) NULL, wxT("wrong index in image list") );
+
return (wxBitmap*)node->Data();
}
-
+
bool wxImageList::Replace( int index, const wxBitmap &bitmap )
{
wxNode *node = m_images.Nth( index );
-
- wxCHECK_MSG( node, FALSE, "wrong index in image list" );
-
+
+ wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") );
+
+ wxBitmap* newBitmap = NULL;
+ if (bitmap.IsKindOf(CLASSINFO(wxIcon)))
+#if defined(__VISAGECPP__)
+//just can't do this in VisualAge now, with all this new Bitmap-Icon stuff
+//so construct it from a bitmap object until I can figure this nonsense out. (DW)
+ newBitmap = new wxBitmap(bitmap) ;
+#else
+ newBitmap = new wxBitmap( (const wxIcon&) bitmap );
+#endif
+ else
+ newBitmap = new wxBitmap(bitmap) ;
+
if (index == m_images.Number()-1)
{
m_images.DeleteNode( node );
- m_images.Append( new wxBitmap(bitmap) );
+ m_images.Append( newBitmap );
}
else
{
wxNode *next = node->Next();
m_images.DeleteNode( node );
- m_images.Insert( next, new wxBitmap(bitmap) );
+ m_images.Insert( next, newBitmap );
}
-
+
return TRUE;
}
bool wxImageList::Remove( int index )
{
wxNode *node = m_images.Nth( index );
-
- wxCHECK_MSG( node, FALSE, "wrong index in image list" );
-
+
+ wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") );
+
m_images.DeleteNode( node );
-
+
return TRUE;
}
bool wxImageList::RemoveAll()
{
m_images.Clear();
-
+
return TRUE;
}
{
width = 0;
height = 0;
-
+
wxNode *node = m_images.Nth( index );
-
- wxCHECK_MSG( node, FALSE, "wrong index in image list" );
-
+
+ wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") );
+
wxBitmap *bm = (wxBitmap*)node->Data();
width = bm->GetWidth();
height = bm->GetHeight();
-
+
return TRUE;
}
int flags, bool WXUNUSED(solidBackground) )
{
wxNode *node = m_images.Nth( index );
-
- wxCHECK_MSG( node, FALSE, "wrong index in image list" );
-
+
+ wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") );
+
wxBitmap *bm = (wxBitmap*)node->Data();
-
- dc.DrawBitmap( *bm, x, y, (flags & wxIMAGELIST_DRAW_TRANSPARENT) > 0 );
+
+ if (bm->IsKindOf(CLASSINFO(wxIcon)))
+ dc.DrawIcon( * ((wxIcon*) bm), x, y);
+ else
+ dc.DrawBitmap( *bm, x, y, (flags & wxIMAGELIST_DRAW_TRANSPARENT) > 0 );
return TRUE;
}