// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "imaglist.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
+#if wxUSE_IMAGLIST
+
#ifdef __BORLANDC__
#pragma hdrstop
#endif
+#include "wx/defs.h"
+
+#ifndef __WXPALMOS__
+
#include "wx/generic/imaglist.h"
+
#include "wx/icon.h"
#include "wx/image.h"
#include "wx/dc.h"
IMPLEMENT_DYNAMIC_CLASS(wxGenericImageList, wxObject)
-#if !defined(__WXMSW__) || defined(__WIN16__) || defined(__WXUNIVERSAL__)
+#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)
/*
* wxImageList has to be a real class or we have problems with
* the run-time information.
wxGenericImageList::~wxGenericImageList()
{
+ (void)RemoveAll();
}
int wxGenericImageList::GetImageCount() const
bool wxGenericImageList::Create()
{
- return TRUE;
+ return true;
}
int wxGenericImageList::Add( const wxBitmap &bitmap )
{
- wxASSERT_MSG( bitmap.GetWidth() == m_width &&
- bitmap.GetHeight() == m_height,
+ 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( (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;
}
return Add(wxBitmap(img));
}
-const wxBitmap *wxGenericImageList::GetBitmap( int index ) const
+const wxBitmap *wxGenericImageList::GetBitmapPtr( int index ) const
{
wxList::compatibility_iterator node = m_images.Item( index );
return (wxBitmap*)node->GetData();
}
+// Get the bitmap
+wxBitmap wxGenericImageList::GetBitmap(int index) const
+{
+ const wxBitmap* bmp = GetBitmapPtr(index);
+ if (bmp)
+ return *bmp;
+ else
+ return wxNullBitmap;
+}
+
+// Get the icon
+wxIcon wxGenericImageList::GetIcon(int index) const
+{
+ const wxBitmap* bmp = GetBitmapPtr(index);
+ if (bmp)
+ {
+ wxIcon icon;
+ icon.CopyFromBitmap(*bmp);
+ return icon;
+ }
+ else
+ return wxNullIcon;
+}
+
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") );
+ wxCHECK_MSG( node, false, wxT("wrong index in image list") );
wxBitmap* newBitmap = (bitmap.IsKindOf(CLASSINFO(wxIcon))) ?
#if defined(__VISAGECPP__)
m_images.Insert( next, newBitmap );
}
- return TRUE;
+ 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") );
+ wxCHECK_MSG( node, false, wxT("wrong index in image list") );
delete node->GetData();
m_images.Erase( node );
- return TRUE;
+ return true;
}
bool wxGenericImageList::RemoveAll()
WX_CLEAR_LIST(wxList, m_images);
m_images.Clear();
- return TRUE;
+ return true;
}
bool wxGenericImageList::GetSize( int index, int &width, int &height ) const
wxList::compatibility_iterator node = m_images.Item( index );
- wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") );
+ 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 wxGenericImageList::Draw( int index, wxDC &dc, int x, int y,
{
wxList::compatibility_iterator node = m_images.Item( index );
- wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") );
+ wxCHECK_MSG( node, false, wxT("wrong index in image list") );
wxBitmap *bm = (wxBitmap*)node->GetData();
else
dc.DrawBitmap( *bm, x, y, (flags & wxIMAGELIST_DRAW_TRANSPARENT) > 0 );
- return TRUE;
+ return true;
}
-
+#endif // wxUSE_IMAGLIST
+#endif // __WXPALMOS__