wxInputConsumer

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

diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index 95614a8281fabb07dbd7f687dcaa5eed0df1f24c..12f621afce17934a1027001e00b83544209eee3a 100644 (file)
--- a/src/generic/imaglist.cpp
+++ b/src/generic/imaglist.cpp
@@ -1,16 +1,16 @@
 /////////////////////////////////////////////////////////////////////////////
-// 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__
 #pragma implementation "imaglist.h"
 #endif
- 
+
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -18,7 +18,9 @@
 #pragma hdrstop
 #endif
 
-#include "wx/imaglist.h"
+#include "wx/generic/imaglist.h"
+#include "wx/icon.h"
+#include "wx/image.h"
 
 //-----------------------------------------------------------------------------
 //  wxImageList
@@ -26,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()
@@ -42,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 );
@@ -50,55 +58,84 @@ bool wxImageList::Create()
 
 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);
 }
 
-const wxBitmap *wxImageList::GetBitmap( int index ) const 
+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 );
-    
-    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;
 }
 
@@ -106,15 +143,15 @@ bool wxImageList::GetSize( int index, int &width, int &height ) const
 {
     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;
 }
 
@@ -122,12 +159,15 @@ bool wxImageList::Draw( int index, wxDC &dc, int x, int y,
                         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;
 }