/////////////////////////////////////////////////////////////////////////////
-// Name: imaglist.cpp
-// Purpose: wxImageList. You may wish to use the generic version.
-// Author: AUTHOR
-// Modified by:
-// Created: ??/??/98
-// RCS-ID: $Id$
-// Copyright: (c) AUTHOR
-// Licence: wxWindows licence
+// Name: generic/imaglist.cpp
+// Purpose:
+// Author: Robert Roebling
+// 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/stubs/imaglist.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject)
+#if wxUSE_IMAGLIST
+
+#ifdef __BORLANDC__
+#pragma hdrstop
#endif
-wxImageList::wxImageList()
+#include "wx/defs.h"
+
+#include "wx/imaglist.h"
+
+#include "wx/icon.h"
+#include "wx/image.h"
+#include "wx/dc.h"
+
+//-----------------------------------------------------------------------------
+// wxImageList
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject)
+
+wxImageList::wxImageList( int width, int height, bool mask, int initialCount )
{
- // TODO: init image list handle, if any
+ (void)Create(width, height, mask, initialCount);
}
wxImageList::~wxImageList()
{
- // TODO: destroy image list handle, if any
+ (void)RemoveAll();
}
+int wxImageList::GetImageCount() const
+{
+ return m_images.GetCount();
+}
-// Attributes
-////////////////////////////////////////////////////////////////////////////
+bool wxImageList::Create( int width, int height, bool WXUNUSED(mask), int WXUNUSED(initialCount) )
+{
+ m_width = width;
+ m_height = height;
-// Returns the number of images in the image list.
-int wxImageList::GetImageCount() const
+ return Create();
+}
+
+bool wxImageList::Create()
+{
+ return true;
+}
+
+int wxImageList::Add( const wxIcon &bitmap )
{
- // TODO
- return 0;
+ 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.") );
+
+ m_images.Append( new wxIcon( bitmap ) );
+
+ if (m_width == 0 && m_height == 0)
+ {
+ m_width = bitmap.GetWidth();
+ m_height = bitmap.GetHeight();
+ }
+
+ return m_images.GetCount()-1;
}
-// Operations
-////////////////////////////////////////////////////////////////////////////
+int wxImageList::Add( const wxBitmap &bitmap )
+{
+ 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.") );
+
+ m_images.Append( new wxBitmap(bitmap) );
-// Creates an image list
-bool wxImageList::Create(int width, int height, bool mask, int initial)
+ if (m_width == 0 && m_height == 0)
+ {
+ m_width = bitmap.GetWidth();
+ m_height = bitmap.GetHeight();
+ }
+
+ return m_images.GetCount()-1;
+}
+
+int wxImageList::Add( const wxBitmap& bitmap, const wxBitmap& mask )
{
- // TODO
- return FALSE;
+ wxBitmap bmp(bitmap);
+ if (mask.Ok())
+ bmp.SetMask(new wxMask(mask));
+ return Add(bmp);
}
-// Adds a bitmap, and optionally a mask bitmap.
-// Note that wxImageList creates new bitmaps, so you may delete
-// 'bitmap' and 'mask'.
-int wxImageList::Add(const wxBitmap& bitmap, const wxBitmap& mask)
+int wxImageList::Add( const wxBitmap& bitmap, const wxColour& maskColour )
{
- // TODO
- return 0;
+ wxImage img = bitmap.ConvertToImage();
+ img.SetMaskColour(maskColour.Red(), maskColour.Green(), maskColour.Blue());
+ return Add(wxBitmap(img));
}
-// Adds a bitmap, using the specified colour to create the mask bitmap
-// Note that wxImageList creates new bitmaps, so you may delete
-// 'bitmap'.
-int wxImageList::Add(const wxBitmap& bitmap, const wxColour& maskColour)
+// Get the bitmap
+wxBitmap wxImageList::GetBitmap(int index) const
{
- // TODO
- return 0;
+ wxList::compatibility_iterator node = m_images.Item( index );
+
+ wxCHECK_MSG( node, wxNullBitmap , wxT("wrong index in image list") );
+
+ wxObject* obj = (wxObject*) node->GetData();
+ if ( obj == NULL )
+ return wxNullBitmap ;
+ else if ( obj->IsKindOf(CLASSINFO(wxIcon)) )
+ return wxBitmap( *(wx_static_cast(wxIcon*,obj)) ) ;
+ else
+ return *(wx_static_cast(wxBitmap*,obj)) ;
}
-// Adds a bitmap and mask from an icon.
-int wxImageList::Add(const wxIcon& icon)
+// Get the icon
+wxIcon wxImageList::GetIcon(int index) const
{
- // TODO
- return 0;
+ wxList::compatibility_iterator node = m_images.Item( index );
+
+ wxCHECK_MSG( node, wxNullIcon , wxT("wrong index in image list") );
+
+ wxObject* obj = (wxObject*) node->GetData();
+ if ( obj == NULL )
+ return wxNullIcon ;
+ else if( obj->IsKindOf(CLASSINFO(wxBitmap)) )
+ {
+ wxFAIL_MSG( wxT("cannot convert from bitmap to icon") ) ;
+ return wxNullIcon ;
+ }
+ else
+ return *(wx_static_cast(wxIcon*,obj)) ;
}
-// Replaces a bitmap, optionally passing a mask bitmap.
-// Note that wxImageList creates new bitmaps, so you may delete
-// 'bitmap' and 'mask'.
-bool wxImageList::Replace(int index, const wxBitmap& bitmap, const wxBitmap& mask)
+bool wxImageList::Replace( int index, const wxBitmap &bitmap )
{
- // TODO
- return 0;
+ wxList::compatibility_iterator node = m_images.Item( index );
+
+ wxCHECK_MSG( node, false, wxT("wrong index in image list") );
+
+ wxBitmap* newBitmap = 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;
}
-// Replaces a bitmap and mask from an icon.
-bool wxImageList::Replace(int index, const wxIcon& icon)
+bool wxImageList::Replace( int index, const wxIcon &bitmap )
{
- // TODO
- return 0;
+ wxList::compatibility_iterator node = m_images.Item( index );
+
+ wxCHECK_MSG( node, false, wxT("wrong index in image list") );
+
+ wxIcon* newBitmap = new wxIcon(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;
}
-// Removes the image at the given index.
-bool wxImageList::Remove(int index)
+bool wxImageList::Remove( int index )
{
- // TODO
- return FALSE;
+ 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;
}
-// Remove all images
bool wxImageList::RemoveAll()
{
- // TODO
- return FALSE;
+ WX_CLEAR_LIST(wxList, m_images);
+ m_images.Clear();
+
+ return true;
+}
+
+bool wxImageList::GetSize( int index, int &width, int &height ) const
+{
+ width = 0;
+ height = 0;
+
+ wxList::compatibility_iterator node = m_images.Item( index );
+
+ wxCHECK_MSG( node, false, wxT("wrong index in image list") );
+
+ wxObject *obj = (wxObject*)node->GetData();
+ if( obj->IsKindOf(CLASSINFO(wxIcon)))
+ {
+ wxIcon *bm = wx_static_cast( wxIcon* , obj ) ;
+ width = bm->GetWidth();
+ height = bm->GetHeight();
+ }
+ else
+ {
+ wxBitmap *bm = wx_static_cast( wxBitmap* , obj ) ;
+ width = bm->GetWidth();
+ height = bm->GetHeight();
+ }
+ return true;
}
-// Draws the given image on a dc at the specified position.
-// If 'solidBackground' is TRUE, Draw sets the image list background
-// colour to the background colour of the wxDC, to speed up
-// drawing by eliminating masked drawing where possible.
-bool wxImageList::Draw(int index, wxDC& dc, int x, int y,
- int flags, bool solidBackground)
+bool wxImageList::Draw( int index, wxDC &dc, int x, int y,
+ int flags, bool WXUNUSED(solidBackground) )
{
- // TODO
- return FALSE;
+ wxList::compatibility_iterator node = m_images.Item( index );
+
+ wxCHECK_MSG( node, false, wxT("wrong index in image list") );
+
+ wxObject *obj = (wxObject*)node->GetData();
+ if( obj->IsKindOf(CLASSINFO(wxIcon)))
+ {
+ wxIcon *bm = wx_static_cast( wxIcon* , obj ) ;
+ dc.DrawIcon( *bm , x, y);
+ }
+ else
+ {
+ wxBitmap *bm = wx_static_cast( wxBitmap* , obj ) ;
+ dc.DrawBitmap( *bm, x, y, (flags & wxIMAGELIST_DRAW_TRANSPARENT) > 0 );
+ }
+
+ return true;
}
+#endif // wxUSE_IMAGLIST
+
projects / wxWidgets.git / blobdiff