Fix for non-CG mode

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

diff --git a/src/mac/carbon/imaglist.cpp b/src/mac/carbon/imaglist.cpp
index 9124331de40772d6edecc3c66748f91311b5e175..054cdeb73407a1ac2eb82ffe21d60d4e71f6cd58 100644 (file)
--- a/src/mac/carbon/imaglist.cpp
+++ b/src/mac/carbon/imaglist.cpp
@@ -1,35 +1,31 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        generic/imaglist.cpp
+// Name:        src/mac/carbon/imaglist.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $id$
+// RCS_ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-// For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#if wxUSE_IMAGLIST
-
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
-#include "wx/defs.h"
+#if wxUSE_IMAGLIST
 
 #include "wx/imaglist.h"
 
-#include "wx/icon.h"
-#include "wx/image.h"
-#include "wx/dc.h"
-
-//-----------------------------------------------------------------------------
-//  wxImageList
-//-----------------------------------------------------------------------------
+#ifndef WX_PRECOMP
+    #include "wx/dc.h"
+    #include "wx/icon.h"
+    #include "wx/image.h"
+#endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject)
 
+
 wxImageList::wxImageList( int width, int height, bool mask, int initialCount )
 {
     (void)Create(width, height, mask, initialCount);
@@ -72,41 +68,58 @@ int wxImageList::Add( const wxIcon &bitmap )
         m_width = bitmap.GetWidth();
         m_height = bitmap.GetHeight();
     }
-    
-    return m_images.GetCount()-1;
+
+    return m_images.GetCount() - 1;
 }
 
 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_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)
     {
         m_width = bitmap.GetWidth();
         m_height = bitmap.GetHeight();
     }
-    
-    return m_images.GetCount()-1;
+
+    return m_images.GetCount() - 1;
 }
 
 int wxImageList::Add( const wxBitmap& bitmap, const wxBitmap& mask )
 {
-    wxBitmap bmp(bitmap);
+    wxBitmap bmp( bitmap );
     if (mask.Ok())
-        bmp.SetMask(new wxMask(mask));
-    return Add(bmp);
+        bmp.SetMask( new wxMask( mask ) );
+
+    return Add( bmp );
 }
 
 int wxImageList::Add( const wxBitmap& bitmap, const wxColour& maskColour )
 {
     wxImage img = bitmap.ConvertToImage();
-    img.SetMaskColour(maskColour.Red(), maskColour.Green(), maskColour.Blue());
-    return Add(wxBitmap(img));
+    img.SetMaskColour( maskColour.Red(), maskColour.Green(), maskColour.Blue() );
+
+    return Add( wxBitmap( img ) );
 }
 
 // Get the bitmap
@@ -120,9 +133,9 @@ wxBitmap wxImageList::GetBitmap(int index) const
     if ( obj == NULL )
         return wxNullBitmap ;
     else if ( obj->IsKindOf(CLASSINFO(wxIcon)) )
-        return wxBitmap( *(wx_static_cast(wxIcon*,obj)) ) ;
-    else 
-        return *(wx_static_cast(wxBitmap*,obj)) ;
+        return wxBitmap( *(wx_static_cast(wxIcon*, obj)) ) ;
+    else
+        return *(wx_static_cast(wxBitmap*, obj)) ;
 }
 
 // Get the icon
@@ -135,13 +148,13 @@ wxIcon wxImageList::GetIcon(int index) const
     wxObject* obj = (wxObject*) node->GetData();
     if ( obj == NULL )
         return wxNullIcon ;
-    else if( obj->IsKindOf(CLASSINFO(wxBitmap)) )
+    else if ( obj->IsKindOf(CLASSINFO(wxBitmap)) )
     {
         wxFAIL_MSG( wxT("cannot convert from bitmap to icon") ) ;
         return wxNullIcon ;
     }
-    else 
-        return *(wx_static_cast(wxIcon*,obj)) ;
+    else
+        return *(wx_static_cast(wxIcon*, obj)) ;
 }
 
 bool wxImageList::Replace( int index, const wxBitmap &bitmap )
@@ -150,11 +163,12 @@ bool wxImageList::Replace( int index, const wxBitmap &bitmap )
 
     wxCHECK_MSG( node, false, wxT("wrong index in image list") );
 
-    wxBitmap* newBitmap = new wxBitmap(bitmap) ;
+    wxBitmap* newBitmap = new wxBitmap( bitmap );
 
     if (index == (int) m_images.GetCount() - 1)
     {
         delete node->GetData();
+
         m_images.Erase( node );
         m_images.Append( newBitmap );
     }
@@ -162,6 +176,7 @@ bool wxImageList::Replace( int index, const wxBitmap &bitmap )
     {
         wxList::compatibility_iterator next = node->GetNext();
         delete node->GetData();
+
         m_images.Erase( node );
         m_images.Insert( next, newBitmap );
     }
@@ -175,7 +190,7 @@ bool wxImageList::Replace( int index, const wxIcon &bitmap )
 
     wxCHECK_MSG( node, false, wxT("wrong index in image list") );
 
-    wxIcon* newBitmap = new wxIcon(bitmap) ;
+    wxIcon* newBitmap = new wxIcon( bitmap );
 
     if (index == (int) m_images.GetCount() - 1)
     {
@@ -194,6 +209,34 @@ bool wxImageList::Replace( int index, const wxIcon &bitmap )
     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 );
@@ -224,7 +267,7 @@ bool wxImageList::GetSize( int index, int &width, int &height ) const
     wxCHECK_MSG( node, false, wxT("wrong index in image list") );
 
     wxObject *obj = (wxObject*)node->GetData();
-    if( obj->IsKindOf(CLASSINFO(wxIcon)))
+    if (obj->IsKindOf(CLASSINFO(wxIcon)))
     {
         wxIcon *bm = wx_static_cast( wxIcon* , obj ) ;
         width = bm->GetWidth();
@@ -236,21 +279,23 @@ bool wxImageList::GetSize( int index, int &width, int &height ) const
         width = bm->GetWidth();
         height = bm->GetHeight();
     }
+
     return true;
 }
 
-bool wxImageList::Draw( int index, wxDC &dc, int x, int y,
-                        int flags, bool WXUNUSED(solidBackground) )
+bool wxImageList::Draw(
+    int index, wxDC &dc, int x, int y,
+    int flags, bool WXUNUSED(solidBackground) )
 {
     wxList::compatibility_iterator node = m_images.Item( index );
 
     wxCHECK_MSG( node, false, wxT("wrong index in image list") );
 
     wxObject *obj = (wxObject*)node->GetData();
-    if( obj->IsKindOf(CLASSINFO(wxIcon)))
+    if (obj->IsKindOf(CLASSINFO(wxIcon)))
     {
         wxIcon *bm = wx_static_cast( wxIcon* , obj ) ;
-        dc.DrawIcon( *bm , x, y);
+        dc.DrawIcon( *bm , x, y );
     }
     else
     {
@@ -262,4 +307,3 @@ bool wxImageList::Draw( int index, wxDC &dc, int x, int y,
 }
 
 #endif // wxUSE_IMAGLIST
-