X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b46e869676813430c8fbf0d5828005f1b898d985..37de49a3225b9e87ec950f73d361335c73ad3f7f:/src/generic/imaglist.cpp diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp index 29ad9cdb75..ea69fbfaf2 100644 --- a/src/generic/imaglist.cpp +++ b/src/generic/imaglist.cpp @@ -1,126 +1,191 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: imaglist.cpp +// Name: generic/imaglist.cpp // Purpose: // Author: Robert Roebling // Id: $id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// 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(__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 ) +{ + (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, + _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; } -bool wxImageList::Create() +int wxGenericImageList::Add( const wxBitmap& bitmap, const wxBitmap& mask ) { - m_images.DeleteContents( TRUE ); - return TRUE; + wxBitmap bmp(bitmap); + if (mask.Ok()) + bmp.SetMask(new wxMask(mask)); + return Add(bmp); } -int wxImageList::Add( const wxBitmap &bitmap ) +int wxGenericImageList::Add( const wxBitmap& bitmap, const wxColour& maskColour ) { - m_images.Append( new wxBitmap(bitmap) ); - return m_images.Number(); + wxImage img = bitmap.ConvertToImage(); + img.SetMaskColour(maskColour.Red(), maskColour.Green(), maskColour.Blue()); + return Add(wxBitmap(img)); } -const wxBitmap *wxImageList::GetBitmap( int index ) const +const wxBitmap *wxGenericImageList::GetBitmap( int index ) const { - wxNode *node = m_images.Nth( index ); - - wxCHECK_MSG( node, (wxBitmap *) NULL, "wrong index in image list" ); - - return (wxBitmap*)node->Data(); + 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::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" ); - - if (index == m_images.Number()-1) + 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) { - m_images.DeleteNode( node ); - m_images.Append( new wxBitmap(bitmap) ); + delete node->GetData(); + m_images.Erase( node ); + m_images.Append( newBitmap ); } else { - wxNode *next = node->Next(); - m_images.DeleteNode( node ); - m_images.Insert( next, new wxBitmap(bitmap) ); + wxList::compatibility_iterator next = node->GetNext(); + delete node->GetData(); + m_images.Erase( node ); + m_images.Insert( next, newBitmap ); } - + 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 ); - + 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 wxImageList::RemoveAll() +bool wxGenericImageList::RemoveAll() { + WX_CLEAR_LIST(wxList, m_images); m_images.Clear(); - + 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(); + + 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 ); - - wxCHECK_MSG( node, FALSE, "wrong index in image list" ); - - wxBitmap *bm = (wxBitmap*)node->Data(); - - dc.DrawBitmap( *bm, x, y, (flags & wxIMAGELIST_DRAW_TRANSPARENT) > 0 ); + 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; }