X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/01111366c9b4ea40eee7f4b13ddfe6f6b9f886db..daebb84bff054d3833baca58a5dc506de56c64a1:/src/generic/imaglist.cpp diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp index fcc9c4e173..9ec73fa68e 100644 --- a/src/generic/imaglist.cpp +++ b/src/generic/imaglist.cpp @@ -1,122 +1,226 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: imaglist.cpp +// Name: src/generic/imaglist.cpp // Purpose: // Author: Robert Roebling // Id: $id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "imaglist.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop #endif - -#include "wx/imaglist.h" + +#if wxUSE_IMAGLIST + +#ifndef __WXPALMOS__ + +#include "wx/generic/imaglist.h" + +#include "wx/icon.h" +#include "wx/image.h" +#include "wx/dc.h" //----------------------------------------------------------------------------- // wxImageList //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject) +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 ) +{ + (void)Create(width, height, mask, initialCount); +} -wxImageList::wxImageList( int width, int height, bool WXUNUSED(mask), int WXUNUSED(initialCount) ) +wxGenericImageList::~wxGenericImageList() { - m_width = width; - m_height = height; - Create(); + (void)RemoveAll(); } -wxImageList::~wxImageList() +int wxGenericImageList::GetImageCount() const { + return m_images.GetCount(); } -int wxImageList::GetImageCount() const +bool wxGenericImageList::Create( int width, int height, bool WXUNUSED(mask), int WXUNUSED(initialCount) ) { - return m_images.Number(); + m_width = width; + m_height = height; + + return Create(); } -bool wxImageList::Create() +bool wxGenericImageList::Create() { - m_images.DeleteContents( TRUE ); - return TRUE; + return true; } -int wxImageList::Add( const wxBitmap &bitmap ) +int wxGenericImageList::Add( const wxBitmap &bitmap ) { - m_images.Append( new wxBitmap(bitmap) ); - return m_images.Number(); + 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) ); + + if (m_width == 0 && m_height == 0) + { + m_width = bitmap.GetWidth(); + m_height = bitmap.GetHeight(); + } + + return m_images.GetCount()-1; } -const wxBitmap *wxImageList::GetBitmap(int index) const { - wxNode *node = m_images.Nth(index); - if (node != NULL) - return (wxBitmap*)node->Data(); +int wxGenericImageList::Add( const wxBitmap& bitmap, const wxBitmap& mask ) +{ + wxBitmap bmp(bitmap); + if (mask.Ok()) + bmp.SetMask(new wxMask(mask)); + return Add(bmp); +} - return (wxBitmap *) NULL; +int wxGenericImageList::Add( const wxBitmap& bitmap, const wxColour& maskColour ) +{ + wxImage img = bitmap.ConvertToImage(); + img.SetMaskColour(maskColour.Red(), maskColour.Green(), maskColour.Blue()); + return Add(wxBitmap(img)); } - -bool wxImageList::Replace( int index, const wxBitmap &bitmap ) + +const wxBitmap *wxGenericImageList::GetBitmapPtr( int index ) const { - wxNode *node = m_images.Nth( index ); - if (!node) return FALSE; - - if (index == m_images.Number()-1) - { - m_images.DeleteNode( node ); - m_images.Append( new wxBitmap(bitmap) ); - } - else - { - wxNode *next = node->Next(); - m_images.DeleteNode( node ); - m_images.Insert( next, new wxBitmap(bitmap) ); - } - - return TRUE; + wxList::compatibility_iterator node = m_images.Item( index ); + + wxCHECK_MSG( node, (wxBitmap *) NULL, wxT("wrong index in image list") ); + + return (wxBitmap*)node->GetData(); } -bool wxImageList::Remove( int index ) +// Get the bitmap +wxBitmap wxGenericImageList::GetBitmap(int index) const { - wxNode *node = m_images.Nth( index ); - if (node) m_images.DeleteNode( node ); - return (node != NULL); + const wxBitmap* bmp = GetBitmapPtr(index); + if (bmp) + return *bmp; + else + return wxNullBitmap; } -bool wxImageList::RemoveAll() +// Get the icon +wxIcon wxGenericImageList::GetIcon(int index) const { - m_images.Clear(); - return TRUE; + const wxBitmap* bmp = GetBitmapPtr(index); + if (bmp) + { + wxIcon icon; + icon.CopyFromBitmap(*bmp); + return icon; + } + else + return wxNullIcon; } -bool wxImageList::GetSize( int index, int &width, int &height ) const +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") ); + + 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::Remove( int index ) +{ + wxList::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 wxGenericImageList::RemoveAll() +{ + WX_CLEAR_LIST(wxList, m_images); + m_images.Clear(); + + return true; +} + +bool wxGenericImageList::GetSize( int index, int &width, int &height ) const { - wxNode *node = m_images.Nth( index ); - if (node) - { - wxBitmap *bm = (wxBitmap*)node->Data(); - width = bm->GetWidth(); - height = bm->GetHeight(); - return TRUE; - } - else - { width = 0; height = 0; - return FALSE; - } + + wxList::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; } -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 ); - if (!node) return FALSE; - wxBitmap *bm = (wxBitmap*)node->Data(); - - wxIcon *icon = (wxIcon*)bm; - dc.DrawIcon( *icon, x, y, (flags & wxIMAGELIST_DRAW_TRANSPARENT) > 0 ); + wxList::compatibility_iterator node = m_images.Item( index ); - return TRUE; -} + wxCHECK_MSG( node, false, wxT("wrong index in image list") ); + + wxBitmap *bm = (wxBitmap*)node->GetData(); + if (bm->IsKindOf(CLASSINFO(wxIcon))) + dc.DrawIcon( * ((wxIcon*) bm), x, y); + else + dc.DrawBitmap( *bm, x, y, (flags & wxIMAGELIST_DRAW_TRANSPARENT) > 0 ); + + return true; +} +#endif // wxUSE_IMAGLIST +#endif // __WXPALMOS__