X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f644bc116bbe46d6ab609a44c05835dc4d87ba02..143591e943c40bd8264cca2a70d8d8688b224ba7:/src/generic/imaglist.cpp diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp index 5f342b70c4..72eb445d73 100644 --- a/src/generic/imaglist.cpp +++ b/src/generic/imaglist.cpp @@ -14,30 +14,24 @@ #pragma hdrstop #endif -#if wxUSE_IMAGLIST +#if wxUSE_IMAGLIST && !defined(wxHAS_NATIVE_IMAGELIST) #ifndef __WXPALMOS__ -#include "wx/generic/imaglist.h" +#include "wx/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 //----------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxGenericImageList, wxObject) - -#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__) -/* - * wxImageList has to be a real class or we have problems with - * the run-time information. - */ - IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxGenericImageList) -#endif wxGenericImageList::wxGenericImageList( int width, int height, bool mask, int initialCount ) { @@ -69,15 +63,34 @@ bool wxGenericImageList::Create() 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) { @@ -198,7 +211,7 @@ bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap, const wxBit m_images.Erase( node ); m_images.Insert( next, newBitmap ); } - + if (mask.Ok()) newBitmap->SetMask(new wxMask(mask)); @@ -258,5 +271,6 @@ bool wxGenericImageList::Draw( int index, wxDC &dc, int x, int y, return true; } -#endif // wxUSE_IMAGLIST #endif // __WXPALMOS__ + +#endif // wxUSE_IMAGLIST