X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1e955e14c1ce17f97fb559923ded1b1d0cdd6b8..7b70a3257f24daa4d574afd03c82e65631af1f2b:/src/generic/imaglist.cpp diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp index 543d019cdf..8aac4fa72e 100644 --- a/src/generic/imaglist.cpp +++ b/src/generic/imaglist.cpp @@ -1,147 +1,193 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: imaglist.cpp +// Name: generic/imaglist.cpp // Purpose: // Author: Robert Roebling -// Created: 01/02/97 -// Id: -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem -// Licence: wxWindows licence +// Id: $id$ +// Copyright: (c) 1998 Robert Roebling +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "imaglist.h" #endif - -#include "wx/imaglist.h" + +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ +#pragma hdrstop +#endif + +#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(__WIN16__) || defined(__WXUNIVERSAL__) +/* + * wxImageList has to be a real class or we have problems with + * the run-time information. + */ -wxImageList::wxImageList( int width, int height, bool WXUNUSED(mask), int WXUNUSED(initialCount) ) +IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxGenericImageList) +#endif + +wxGenericImageList::wxGenericImageList( int width, int height, bool mask, int initialCount ) { - m_width = width; - m_height = height; - Create(); + (void)Create(width, height, mask, initialCount); } -wxImageList::~wxImageList() +wxGenericImageList::~wxGenericImageList() { + (void)RemoveAll(); } -int wxImageList::GetImageCount() const +int wxGenericImageList::GetImageCount() const { - return m_images.Number(); + return m_images.GetCount(); } -bool wxImageList::Create() +bool wxGenericImageList::Create( int width, int height, bool WXUNUSED(mask), int WXUNUSED(initialCount) ) { - m_images.DeleteContents( TRUE ); - return TRUE; + m_width = width; + m_height = height; + + return Create(); } -int wxImageList::Add( const wxBitmap &bitmap ) +bool wxGenericImageList::Create() { - m_images.Append( new wxBitmap(bitmap) ); - return m_images.Number(); + return TRUE; } -wxBitmap *wxImageList::GetBitmap(int index) { - wxNode *node = m_images.Nth(index); - if (node != NULL) - return (wxBitmap*)node->Data(); +int wxGenericImageList::Add( const wxBitmap &bitmap ) +{ + wxASSERT_MSG( bitmap.GetWidth() == m_width && + bitmap.GetHeight() == m_height, + _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) ); + return m_images.GetCount()-1; +} - return (wxBitmap *) NULL; +int wxGenericImageList::Add( const wxBitmap& bitmap, const wxBitmap& mask ) +{ + wxBitmap bmp(bitmap); + if (mask.Ok()) + bmp.SetMask(new wxMask(mask)); + return Add(bmp); } - -bool wxImageList::Replace( int index, const wxBitmap &bitmap ) + +int wxGenericImageList::Add( const wxBitmap& bitmap, const wxColour& maskColour ) { - 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; + wxImage img = bitmap.ConvertToImage(); + img.SetMaskColour(maskColour.Red(), maskColour.Green(), maskColour.Blue()); + return Add(wxBitmap(img)); } -bool wxImageList::Remove( int index ) +const wxBitmap *wxGenericImageList::GetBitmap( int index ) const { - wxNode *node = m_images.Nth( index ); - if (node) m_images.DeleteNode( node ); - return (node != NULL); + 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::RemoveAll() +bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap ) { - m_images.Clear(); - return TRUE; + 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 wxImageList::GetSize( int index, int &width, int &height ) const +bool wxGenericImageList::Remove( int index ) { -#ifdef __WXGTK__ - - width = m_width; - height = m_height; - - return (m_images.Nth( index ) != NULL); - -#else - - wxNode *node = m_images.Nth( index ); - if (node) - { - wxBitmap *bm = (wxBitmap*)node->Data(); - width = bm->GetWidth(); - height = bm->GetHeight(); + 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; - } - else - { +} + +bool wxGenericImageList::GetSize( int index, int &width, int &height ) const +{ width = 0; height = 0; - return FALSE; - } -#endif + 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(); - -#ifdef __WXGTK__ - - // As X doesn't have a standard size for icons, we resize here. - // Otherwise we'd simply have to forbid different bitmap sizes. - - if ((m_width != bm->GetWidth()) || - (m_height != bm->GetHeight())) - { - bm->Resize( m_width, m_height ); - } - -#endif - - wxIcon *icon = (wxIcon*)bm; - dc.DrawIcon( *icon, x, y, (flags & wxIMAGELIST_DRAW_TRANSPARENT) > 0 ); - - return TRUE; + wxList::compatibility_iterator node = m_images.Item( index ); + + 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; }