Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't fail assertion about image size mismatch if the size hasn't been

Browse Source 
set yet.  If the size hasn't been set then set it when the first image
is added.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2005-01-29 01:00:01 +00:00
parent 89be85c244
commit b931414d91
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/generic/imaglist.cpp
View File

@@ -73,8 +73,8 @@ bool wxGenericImageList::Create()
int wxGenericImageList::Add( const wxBitmap &bitmap ) int wxGenericImageList::Add( const wxBitmap &bitmap )
{ {
wxASSERT_MSG( bitmap.GetWidth() == m_width && wxASSERT_MSG( (bitmap.GetWidth() == m_width && bitmap.GetHeight() == m_height)
bitmap.GetHeight() == m_height, || (m_width == 0 && m_height == 0),
_T("invalid bitmap size in wxImageList: this might work ") _T("invalid bitmap size in wxImageList: this might work ")
_T("on this platform but definitely won't under Windows.") ); _T("on this platform but definitely won't under Windows.") );
@@ -82,6 +82,13 @@ int wxGenericImageList::Add( const wxBitmap &bitmap )
m_images.Append( new wxIcon( (const wxIcon&) bitmap ) ); m_images.Append( new wxIcon( (const wxIcon&) bitmap ) );
else else
m_images.Append( new wxBitmap(bitmap) ); 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 m_images.GetCount()-1;
} }