X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/01111366c9b4ea40eee7f4b13ddfe6f6b9f886db..d5b08e7b0715abfded6e42433ca21f9dd9567dd3:/src/generic/imaglist.cpp

diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index fcc9c4e173..e6dcbfd926 100644
--- a/src/generic/imaglist.cpp
+++ b/src/generic/imaglist.cpp
@@ -11,7 +11,15 @@
 #pragma implementation "imaglist.h"
 #endif
  
-#include "wx/imaglist.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#include "wx/generic/imaglist.h"
+#include "wx/icon.h"
 
 //-----------------------------------------------------------------------------
 //  wxImageList
@@ -21,9 +29,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject)
 
 wxImageList::wxImageList( int width, int height, bool WXUNUSED(mask), int WXUNUSED(initialCount) )
 {
-  m_width = width;
-  m_height = height;
-  Create();
+    m_width = width;
+    m_height = height;
+    Create();
 }
 
 wxImageList::~wxImageList()
@@ -32,91 +40,109 @@ wxImageList::~wxImageList()
 
 int wxImageList::GetImageCount() const
 {
-  return m_images.Number();
+    return m_images.Number();
 }
 
 bool wxImageList::Create()
 {
-  m_images.DeleteContents( TRUE );
-  return TRUE;
+    m_images.DeleteContents( TRUE );
+    return TRUE;
 }
 
 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);
-  if (node != NULL)
+const wxBitmap *wxImageList::GetBitmap( int index ) const 
+{
+    wxNode *node = m_images.Nth( index );
+    
+    wxCHECK_MSG( node, (wxBitmap *) NULL, _T("wrong index in image list") );
+    
     return (wxBitmap*)node->Data();
-
-  return (wxBitmap *) NULL;
 }
     
 bool wxImageList::Replace( int index, const wxBitmap &bitmap )
 {
-  wxNode *node = m_images.Nth( index );
-  if (!node) return FALSE;
-  
-  if (index == m_images.Number()-1)
-  {
-    m_images.DeleteNode( node );
-    m_images.Append( new wxBitmap(bitmap) );
-  }
-  else
-  {
-    wxNode *next = node->Next();
-    m_images.DeleteNode( node );
-    m_images.Insert( next, new wxBitmap(bitmap) );
-  }
+    wxNode *node = m_images.Nth( index );
+    
+    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( newBitmap );
+    }
+    else
+    {
+        wxNode *next = node->Next();
+        m_images.DeleteNode( node );
+        m_images.Insert( next, newBitmap );
+    }
   
-  return TRUE;
+    return TRUE;
 }
 
 bool wxImageList::Remove( int index )
 {
-  wxNode *node = m_images.Nth( index );
-  if (node) m_images.DeleteNode( node );
-  return (node != NULL);
+    wxNode *node = m_images.Nth( index );
+    
+    wxCHECK_MSG( node, FALSE, _T("wrong index in image list") );
+    
+    m_images.DeleteNode( node );
+     
+    return TRUE;
 }
 
 bool wxImageList::RemoveAll()
 {
-  m_images.Clear();
-  return TRUE;
+    m_images.Clear();
+    
+    return TRUE;
 }
 
 bool wxImageList::GetSize( int index, int &width, int &height ) const
 {
-  wxNode *node = m_images.Nth( index );
-  if (node)
-  {
+    width = 0;
+    height = 0;
+    
+    wxNode *node = m_images.Nth( index );
+    
+    wxCHECK_MSG( node, FALSE, _T("wrong index in image list") );
+    
     wxBitmap *bm = (wxBitmap*)node->Data();
     width = bm->GetWidth();
     height = bm->GetHeight();
+    
     return TRUE;
-  }
-  else
-  {
-    width = 0;
-    height = 0;
-    return FALSE;
-  }
 }
 
 bool wxImageList::Draw( int index, wxDC &dc, int x, int y,
                         int flags, bool WXUNUSED(solidBackground) )
 {
-  wxNode *node = m_images.Nth( index );
-  if (!node) return FALSE;
-  wxBitmap *bm = (wxBitmap*)node->Data();
-  
-  wxIcon *icon = (wxIcon*)bm;
-  dc.DrawIcon( *icon, x, y, (flags & wxIMAGELIST_DRAW_TRANSPARENT) > 0 );
+    wxNode *node = m_images.Nth( index );
+    
+    wxCHECK_MSG( node, FALSE, _T("wrong index in image list") );
+    
+    wxBitmap *bm = (wxBitmap*)node->Data();
 
-  return TRUE;
+    if (bm->IsKindOf(CLASSINFO(wxIcon)))
+        dc.DrawIcon( * ((wxIcon*) bm), x, y);
+    else
+        dc.DrawBitmap( *bm, x, y, (flags & wxIMAGELIST_DRAW_TRANSPARENT) > 0 );
+
+    return TRUE;
 }