X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f60d0f944a6ce86bce59901e7ea3811f0992bce7..ad653fa23069c5d9378247084f03c9a718c3ad62:/src/generic/imaglist.cpp diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp index b0dc6594c7..4ca54a6e75 100644 --- a/src/generic/imaglist.cpp +++ b/src/generic/imaglist.cpp @@ -1,147 +1,274 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: imaglist.cpp +// Name: src/generic/imaglist.cpp // Purpose: // Author: Robert Roebling -// Id: $id$ +// Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "imaglist.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif -#include "wx/generic/imaglist.h" +#if wxUSE_IMAGLIST && !defined(wxHAS_NATIVE_IMAGELIST) + +#include "wx/imaglist.h" + +#ifndef WX_PRECOMP + #include "wx/dc.h" + #include "wx/icon.h" + #include "wx/image.h" +#endif //----------------------------------------------------------------------------- // wxImageList //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject) +IMPLEMENT_DYNAMIC_CLASS(wxGenericImageList, wxObject) +IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxGenericImageList) -wxImageList::wxImageList( int width, int height, bool WXUNUSED(mask), int WXUNUSED(initialCount) ) +wxGenericImageList::wxGenericImageList( int width, int height, bool mask, int initialCount ) +{ + (void)Create(width, height, mask, initialCount); +} + +wxGenericImageList::~wxGenericImageList() +{ + (void)RemoveAll(); +} + +int wxGenericImageList::GetImageCount() const +{ + return m_images.GetCount(); +} + +bool wxGenericImageList::Create( int width, int height, bool WXUNUSED(mask), int WXUNUSED(initialCount) ) { m_width = width; m_height = height; - Create(); + + return Create(); } -wxImageList::~wxImageList() +bool wxGenericImageList::Create() { + return true; } -int wxImageList::GetImageCount() const +int wxGenericImageList::Add( const wxBitmap &bitmap ) { - return m_images.Number(); + wxASSERT_MSG( (bitmap.GetWidth() >= m_width && bitmap.GetHeight() == m_height) + || (m_width == 0 && m_height == 0), + wxT("invalid bitmap size in wxImageList: this might work ") + wxT("on this platform but definitely won't under Windows.") ); + + const int index = int(m_images.GetCount()); + + if (bitmap.IsKindOf(wxCLASSINFO(wxIcon))) + { + m_images.Append( new wxIcon( (const wxIcon&) bitmap ) ); + } + else + { + // Mimic behaviour 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 index; } -bool wxImageList::Create() +int wxGenericImageList::Add( const wxBitmap& bitmap, const wxBitmap& mask ) { - m_images.DeleteContents( TRUE ); - return TRUE; + wxBitmap bmp(bitmap); + if (mask.IsOk()) + bmp.SetMask(new wxMask(mask)); + return Add(bmp); } -int wxImageList::Add( const wxBitmap &bitmap ) +int wxGenericImageList::Add( const wxBitmap& bitmap, const wxColour& maskColour ) { - if (bitmap.IsKindOf(CLASSINFO(wxIcon))) - m_images.Append( new wxIcon( (const wxIcon&) bitmap ) ); + wxImage img = bitmap.ConvertToImage(); + img.SetMaskColour(maskColour.Red(), maskColour.Green(), maskColour.Blue()); + return Add(wxBitmap(img)); +} + +const wxBitmap *wxGenericImageList::GetBitmapPtr( int index ) const +{ + wxObjectList::compatibility_iterator node = m_images.Item( index ); + + wxCHECK_MSG( node, NULL, wxT("wrong index in image list") ); + + return (wxBitmap*)node->GetData(); +} + +// Get the bitmap +wxBitmap wxGenericImageList::GetBitmap(int index) const +{ + const wxBitmap* bmp = GetBitmapPtr(index); + if (bmp) + return *bmp; else - m_images.Append( new wxBitmap(bitmap) ); - return m_images.Number(); + return wxNullBitmap; } -const wxBitmap *wxImageList::GetBitmap( int index ) const +// Get the icon +wxIcon wxGenericImageList::GetIcon(int index) const { - wxNode *node = m_images.Nth( index ); - - wxCHECK_MSG( node, (wxBitmap *) NULL, "wrong index in image list" ); - - return (wxBitmap*)node->Data(); + const wxBitmap* bmp = GetBitmapPtr(index); + if (bmp) + { + wxIcon icon; + icon.CopyFromBitmap(*bmp); + return icon; + } + else + return wxNullIcon; } - -bool wxImageList::Replace( int index, const wxBitmap &bitmap ) + +bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap ) { - wxNode *node = m_images.Nth( index ); - - wxCHECK_MSG( node, FALSE, "wrong index in image list" ); + wxObjectList::compatibility_iterator node = m_images.Item( index ); + + wxCHECK_MSG( node, false, wxT("wrong index in image list") ); - wxBitmap* newBitmap = NULL; - if (bitmap.IsKindOf(CLASSINFO(wxIcon))) - newBitmap = new wxIcon( (const wxIcon&) bitmap ); + wxBitmap* newBitmap = (bitmap.IsKindOf(wxCLASSINFO(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 - newBitmap = new wxBitmap(bitmap) ; + { + wxObjectList::compatibility_iterator next = node->GetNext(); + delete node->GetData(); + m_images.Erase( node ); + m_images.Insert( next, newBitmap ); + } + + return true; +} - if (index == m_images.Number()-1) +bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap, const wxBitmap &mask ) +{ + wxObjectList::compatibility_iterator node = m_images.Item( index ); + + wxCHECK_MSG( node, false, wxT("wrong index in image list") ); + + wxBitmap* newBitmap = (bitmap.IsKindOf(wxCLASSINFO(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) { - m_images.DeleteNode( node ); + delete node->GetData(); + m_images.Erase( node ); m_images.Append( newBitmap ); } else { - wxNode *next = node->Next(); - m_images.DeleteNode( node ); + wxObjectList::compatibility_iterator next = node->GetNext(); + delete node->GetData(); + m_images.Erase( node ); m_images.Insert( next, newBitmap ); } - - return TRUE; + + if (mask.IsOk()) + newBitmap->SetMask(new wxMask(mask)); + + return true; } -bool wxImageList::Remove( int index ) +bool wxGenericImageList::Remove( int index ) { - wxNode *node = m_images.Nth( index ); - - wxCHECK_MSG( node, FALSE, "wrong index in image list" ); - - m_images.DeleteNode( node ); - - return TRUE; + wxObjectList::compatibility_iterator node = m_images.Item( index ); + + wxCHECK_MSG( node, false, wxT("wrong index in image list") ); + + delete node->GetData(); + m_images.Erase( node ); + + return true; } -bool wxImageList::RemoveAll() +bool wxGenericImageList::RemoveAll() { + WX_CLEAR_LIST(wxObjectList, m_images); m_images.Clear(); - - return TRUE; + + return true; } -bool wxImageList::GetSize( int index, int &width, int &height ) const +bool wxGenericImageList::GetSize( int index, int &width, int &height ) const { width = 0; height = 0; - - wxNode *node = m_images.Nth( index ); - - wxCHECK_MSG( node, FALSE, "wrong index in image list" ); - - wxBitmap *bm = (wxBitmap*)node->Data(); + + wxObjectList::compatibility_iterator node = m_images.Item( index ); + + 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 wxImageList::Draw( int index, wxDC &dc, int x, int y, +bool wxGenericImageList::Draw( int index, wxDC &dc, int x, int y, int flags, bool WXUNUSED(solidBackground) ) { - wxNode *node = m_images.Nth( index ); - - wxCHECK_MSG( node, FALSE, "wrong index in image list" ); - - wxBitmap *bm = (wxBitmap*)node->Data(); + wxObjectList::compatibility_iterator node = m_images.Item( index ); + + wxCHECK_MSG( node, false, wxT("wrong index in image list") ); - if (bm->IsKindOf(CLASSINFO(wxIcon))) + wxBitmap *bm = (wxBitmap*)node->GetData(); + + if (bm->IsKindOf(wxCLASSINFO(wxIcon))) dc.DrawIcon( * ((wxIcon*) bm), x, y); else dc.DrawBitmap( *bm, x, y, (flags & wxIMAGELIST_DRAW_TRANSPARENT) > 0 ); - return TRUE; + return true; } - +#endif // wxUSE_IMAGLIST