fix wrong assert in SetItemBitmap() (patch 1668449; bug 1667505)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44663 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/bmpcboxg.cpp b/src/generic/bmpcboxg.cpp
index 3432680bd667e0013fb64884b320dca686c9777d..211e94dd30284991967365b65e1d4fbc07db3091 100644 (file)
--- a/src/generic/bmpcboxg.cpp
+++ b/src/generic/bmpcboxg.cpp
@@ -146,6 +146,9 @@ bool wxBitmapComboBox::Create(wxWindow *parent,
 void wxBitmapComboBox::PostCreate()
 {
     m_fontHeight = GetCharHeight() + EXTRA_FONT_HEIGHT;
 void wxBitmapComboBox::PostCreate()
 {
     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);
     *GetBitmapPtr(n) = bitmap;
 
     OnAddBitmap(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);
 }