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 )
{
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 = NULL;
- if (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)
- newBitmap = new wxBitmap(bitmap) ;
-#else
- newBitmap = new wxBitmap( (const wxIcon&) bitmap );
-#endif
- else
- newBitmap = new wxBitmap(bitmap) ;
+ 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.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;
}