move some data definitions to more appropriate places

[wxWidgets.git] / src / mac / carbon / imaglist.cpp

diff --git a/src/mac/carbon/imaglist.cpp b/src/mac/carbon/imaglist.cpp
index 403567198e676bcc64a8b452e6723efdbd06135e..04c71a729aabc68bfd0a40fc7740b4039b0d92c9 100644 (file)
--- a/src/mac/carbon/imaglist.cpp
+++ b/src/mac/carbon/imaglist.cpp
@@ -16,9 +16,13 @@
 #if wxUSE_IMAGLIST
 
 #include "wx/imaglist.h"
 #if wxUSE_IMAGLIST
 
 #include "wx/imaglist.h"

-#include "wx/icon.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/dc.h"
+    #include "wx/icon.h"
+#endif
+

 #include "wx/image.h"
 #include "wx/image.h"

-#include "wx/dc.h"

 
 IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject)
 


@@ -71,12 +75,27 @@ int wxImageList::Add( const wxIcon &bitmap )
 
 int wxImageList::Add( const wxBitmap &bitmap )
 {
 
 int wxImageList::Add( const wxBitmap &bitmap )
 {

-    wxASSERT_MSG( (bitmap.GetWidth() == m_width && bitmap.GetHeight() == m_height)
+    wxASSERT_MSG( (bitmap.GetWidth() >= m_width && bitmap.GetHeight() == m_height)

                   || (m_width == 0 && m_height == 0),
                   _T("invalid bitmap size in wxImageList: this might work ")
                   _T("on this platform but definitely won't under Windows.") );
 
                   || (m_width == 0 && m_height == 0),
                   _T("invalid bitmap size in wxImageList: this might work ")
                   _T("on this platform but definitely won't under Windows.") );
 

-    m_images.Append( new wxBitmap( bitmap ) );
+    // Mimic behavior of Windows ImageList_Add that automatically breaks up the added
+    // bitmap into sub-images of the correct size
+    if (m_width > 0 && bitmap.GetWidth() > m_width && bitmap.GetHeight() >= m_height)
+    {
+        int numImages = bitmap.GetWidth() / m_width;
+        for (int subIndex = 0; subIndex < numImages; subIndex++)
+        {
+            wxRect rect(m_width * subIndex, 0, m_width, m_height);
+            wxBitmap tmpBmp = bitmap.GetSubBitmap(rect);
+            m_images.Append( new wxBitmap(tmpBmp) );
+        }
+    }
+    else
+    {
+        m_images.Append( new wxBitmap(bitmap) );
+    }

 
     if (m_width == 0 && m_height == 0)
     {
 
     if (m_width == 0 && m_height == 0)
     {


@@ -191,6 +210,34 @@ bool wxImageList::Replace( int index, const wxIcon &bitmap )
     return true;
 }
 
     return true;
 }
 

+bool wxImageList::Replace( int index, const wxBitmap &bitmap, const wxBitmap &mask )
+{
+    wxList::compatibility_iterator node = m_images.Item( index );
+
+    wxCHECK_MSG( node, false, wxT("wrong index in image list") );
+
+    wxBitmap* newBitmap = new wxBitmap(bitmap);
+
+    if (index == (int) m_images.GetCount() - 1)
+    {
+        delete node->GetData();
+        m_images.Erase( node );
+        m_images.Append( newBitmap );
+    }
+    else
+    {
+        wxList::compatibility_iterator next = node->GetNext();
+        delete node->GetData();
+        m_images.Erase( node );
+        m_images.Insert( next, newBitmap );
+    }
+
+    if (mask.Ok())
+        newBitmap->SetMask(new wxMask(mask));
+
+    return true;
+}
+

 bool wxImageList::Remove( int index )
 {
     wxList::compatibility_iterator node = m_images.Item( index );
 bool wxImageList::Remove( int index )
 {
     wxList::compatibility_iterator node = m_images.Item( index );