merged 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// 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__
|
||||
@@ -28,11 +28,9 @@
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject)
|
||||
|
||||
wxImageList::wxImageList( int width, int height, bool WXUNUSED(mask), int WXUNUSED(initialCount) )
|
||||
wxImageList::wxImageList( int width, int height, bool mask, int initialCount )
|
||||
{
|
||||
m_width = width;
|
||||
m_height = height;
|
||||
Create();
|
||||
(void)Create(width, height, mask, initialCount);
|
||||
}
|
||||
|
||||
wxImageList::~wxImageList()
|
||||
@@ -44,6 +42,14 @@ int wxImageList::GetImageCount() const
|
||||
return m_images.Number();
|
||||
}
|
||||
|
||||
bool wxImageList::Create( int width, int height, bool WXUNUSED(mask), int WXUNUSED(initialCount) )
|
||||
{
|
||||
m_width = width;
|
||||
m_height = height;
|
||||
|
||||
return Create();
|
||||
}
|
||||
|
||||
bool wxImageList::Create()
|
||||
{
|
||||
m_images.DeleteContents( TRUE );
|
||||
|
Reference in New Issue
Block a user