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

fix wrong assert in SetItemBitmap() (patch 1668449; bug 1667505) [backport from HEAD]

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@44665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-03-07 23:29:03 +00:00
parent 8ff7d4b06d
commit 3f0bfc200d
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/generic/bmpcboxg.cpp
View File

@@ -146,6 +146,9 @@ bool wxBitmapComboBox::Create(wxWindow *parent,
void wxBitmapComboBox::PostCreate() void wxBitmapComboBox::PostCreate()
{ {
m_fontHeight = GetCharHeight() + EXTRA_FONT_HEIGHT; m_fontHeight = GetCharHeight() + EXTRA_FONT_HEIGHT;
while ( m_bitmaps.GetCount() < GetCount() )
m_bitmaps.Add( new wxBitmap() );
} }
wxBitmapComboBox::~wxBitmapComboBox() wxBitmapComboBox::~wxBitmapComboBox()
@@ -159,7 +162,7 @@ wxBitmapComboBox::~wxBitmapComboBox()
void wxBitmapComboBox::SetItemBitmap(unsigned int n, const wxBitmap& bitmap) void wxBitmapComboBox::SetItemBitmap(unsigned int n, const wxBitmap& bitmap)
{ {
wxCHECK_RET( n < m_bitmaps.size(), wxT("invalid item index") ); wxCHECK_RET( n < GetCount(), wxT("invalid item index") );
OnAddBitmap(bitmap); OnAddBitmap(bitmap);
*GetBitmapPtr(n) = bitmap; *GetBitmapPtr(n) = bitmap;
@@ -169,7 +172,7 @@ void wxBitmapComboBox::SetItemBitmap(unsigned int n, const wxBitmap& bitmap)
wxBitmap wxBitmapComboBox::GetItemBitmap(unsigned int n) const wxBitmap wxBitmapComboBox::GetItemBitmap(unsigned int n) const
{ {
wxCHECK_MSG( n < m_bitmaps.size(), wxNullBitmap, wxT("invalid item index") ); wxCHECK_MSG( n < GetCount(), wxNullBitmap, wxT("invalid item index") );
return *GetBitmapPtr(n); return *GetBitmapPtr(n);
} }