X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/999836aacade840a5d9a0cbb5fad7b1d4de62c93..4107600f205d9d4951c0ffaa4aadb1bc2b75dcf2:/src/generic/imaglist.cpp diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp index 5fa3b027cd..4fbf79d9df 100644 --- a/src/generic/imaglist.cpp +++ b/src/generic/imaglist.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: generic/imaglist.cpp +// Name: src/generic/imaglist.cpp // Purpose: // Author: Robert Roebling // Id: $id$ @@ -7,21 +7,24 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "imaglist.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_IMAGLIST + +#ifndef __WXPALMOS__ + #include "wx/generic/imaglist.h" -#include "wx/icon.h" -#include "wx/image.h" -#include "wx/dc.h" + +#ifndef WX_PRECOMP + #include "wx/dc.h" + #include "wx/icon.h" + #include "wx/image.h" +#endif //----------------------------------------------------------------------------- // wxImageList @@ -29,7 +32,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxGenericImageList, wxObject) -#if !defined(__WXMSW__) || defined(__WIN16__) || defined(__WXUNIVERSAL__) +#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__) /* * wxImageList has to be a real class or we have problems with * the run-time information. @@ -45,6 +48,7 @@ wxGenericImageList::wxGenericImageList( int width, int height, bool mask, int in wxGenericImageList::~wxGenericImageList() { + (void)RemoveAll(); } int wxGenericImageList::GetImageCount() const @@ -62,20 +66,46 @@ bool wxGenericImageList::Create( int width, int height, bool WXUNUSED(mask), int bool wxGenericImageList::Create() { - return TRUE; + return true; } int wxGenericImageList::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.") ); if (bitmap.IsKindOf(CLASSINFO(wxIcon))) + { m_images.Append( new wxIcon( (const wxIcon&) bitmap ) ); + } else - 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; } @@ -94,7 +124,7 @@ int wxGenericImageList::Add( const wxBitmap& bitmap, const wxColour& maskColour return Add(wxBitmap(img)); } -const wxBitmap *wxGenericImageList::GetBitmap( int index ) const +const wxBitmap *wxGenericImageList::GetBitmapPtr( int index ) const { wxList::compatibility_iterator node = m_images.Item( index ); @@ -103,11 +133,68 @@ const wxBitmap *wxGenericImageList::GetBitmap( int index ) const return (wxBitmap*)node->GetData(); } +// Get the bitmap +wxBitmap wxGenericImageList::GetBitmap(int index) const +{ + const wxBitmap* bmp = GetBitmapPtr(index); + if (bmp) + return *bmp; + else + return wxNullBitmap; +} + +// Get the icon +wxIcon wxGenericImageList::GetIcon(int index) const +{ + const wxBitmap* bmp = GetBitmapPtr(index); + if (bmp) + { + wxIcon icon; + icon.CopyFromBitmap(*bmp); + return icon; + } + else + return wxNullIcon; +} + bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap ) { wxList::compatibility_iterator node = m_images.Item( index ); - wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") ); + wxCHECK_MSG( node, false, wxT("wrong index in image list") ); + + wxBitmap* newBitmap = (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) + new wxBitmap(bitmap) + #else + new wxBitmap( (const wxIcon&) bitmap ) + #endif + : 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 ); + } + + return true; +} + +bool wxGenericImageList::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 = (bitmap.IsKindOf(CLASSINFO(wxIcon))) ? #if defined(__VISAGECPP__) @@ -133,19 +220,22 @@ bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap ) m_images.Insert( next, newBitmap ); } - return TRUE; + if (mask.Ok()) + newBitmap->SetMask(new wxMask(mask)); + + return true; } bool wxGenericImageList::Remove( int index ) { wxList::compatibility_iterator node = m_images.Item( index ); - wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") ); + wxCHECK_MSG( node, false, wxT("wrong index in image list") ); delete node->GetData(); m_images.Erase( node ); - return TRUE; + return true; } bool wxGenericImageList::RemoveAll() @@ -153,7 +243,7 @@ bool wxGenericImageList::RemoveAll() WX_CLEAR_LIST(wxList, m_images); m_images.Clear(); - return TRUE; + return true; } bool wxGenericImageList::GetSize( int index, int &width, int &height ) const @@ -163,13 +253,13 @@ bool wxGenericImageList::GetSize( int index, int &width, int &height ) const wxList::compatibility_iterator node = m_images.Item( index ); - wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") ); + wxCHECK_MSG( node, false, wxT("wrong index in image list") ); wxBitmap *bm = (wxBitmap*)node->GetData(); width = bm->GetWidth(); height = bm->GetHeight(); - return TRUE; + return true; } bool wxGenericImageList::Draw( int index, wxDC &dc, int x, int y, @@ -177,7 +267,7 @@ bool wxGenericImageList::Draw( int index, wxDC &dc, int x, int y, { wxList::compatibility_iterator node = m_images.Item( index ); - wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") ); + wxCHECK_MSG( node, false, wxT("wrong index in image list") ); wxBitmap *bm = (wxBitmap*)node->GetData(); @@ -186,7 +276,9 @@ bool wxGenericImageList::Draw( int index, wxDC &dc, int x, int y, else dc.DrawBitmap( *bm, x, y, (flags & wxIMAGELIST_DRAW_TRANSPARENT) > 0 ); - return TRUE; + return true; } +#endif // __WXPALMOS__ +#endif // wxUSE_IMAGLIST