#if => #if defined()

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

diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index 95614a8281fabb07dbd7f687dcaa5eed0df1f24c..e6dcbfd926bc752a8cbb4aed574681330d4e563f 100644 (file)
--- a/src/generic/imaglist.cpp
+++ b/src/generic/imaglist.cpp
@@ -18,7 +18,8 @@
 #pragma hdrstop
 #endif
 
-#include "wx/imaglist.h"
+#include "wx/generic/imaglist.h"
+#include "wx/icon.h"
 
 //-----------------------------------------------------------------------------
 //  wxImageList
@@ -50,15 +51,18 @@ 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;
 }
 
 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, _T("wrong index in image list") );
     
     return (wxBitmap*)node->Data();
 }
@@ -67,18 +71,24 @@ 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, _T("wrong index in image list") );
+
+    wxBitmap* newBitmap = NULL;
+    if (bitmap.IsKindOf(CLASSINFO(wxIcon)))
+        newBitmap = new wxIcon( (const wxIcon&) bitmap );
+    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;
@@ -88,7 +98,7 @@ bool wxImageList::Remove( int index )
 {
     wxNode *node = m_images.Nth( index );
     
-    wxCHECK_MSG( node, FALSE, "wrong index in image list" );
+    wxCHECK_MSG( node, FALSE, _T("wrong index in image list") );
     
     m_images.DeleteNode( node );
      
@@ -109,7 +119,7 @@ bool wxImageList::GetSize( int index, int &width, int &height ) const
     
     wxNode *node = m_images.Nth( index );
     
-    wxCHECK_MSG( node, FALSE, "wrong index in image list" );
+    wxCHECK_MSG( node, FALSE, _T("wrong index in image list") );
     
     wxBitmap *bm = (wxBitmap*)node->Data();
     width = bm->GetWidth();
@@ -123,11 +133,14 @@ bool wxImageList::Draw( int index, wxDC &dc, int x, int y,
 {
     wxNode *node = m_images.Nth( index );
     
-    wxCHECK_MSG( node, FALSE, "wrong index in image list" );
+    wxCHECK_MSG( node, FALSE, _T("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;
 }