return index of first added image in Add(), like MSW does, #10013

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

diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index 72eb445d73d312dd5c2ca4496992b8d9d4da6fad..b285c15935b817ddef0357887e79198ec4fbe272 100644 (file)
--- a/src/generic/imaglist.cpp
+++ b/src/generic/imaglist.cpp
@@ -2,7 +2,7 @@
 // Name:        src/generic/imaglist.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        src/generic/imaglist.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Id:          $id$
+// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -68,6 +68,8 @@ int wxGenericImageList::Add( const wxBitmap &bitmap )
                   _T("invalid bitmap size in wxImageList: this might work ")
                   _T("on this platform but definitely won't under Windows.") );
 
                   _T("invalid bitmap size in wxImageList: this might work ")
                   _T("on this platform but definitely won't under Windows.") );
 

+    const int index = int(m_images.GetCount());
+

     if (bitmap.IsKindOf(CLASSINFO(wxIcon)))
     {
         m_images.Append( new wxIcon( (const wxIcon&) bitmap ) );
     if (bitmap.IsKindOf(CLASSINFO(wxIcon)))
     {
         m_images.Append( new wxIcon( (const wxIcon&) bitmap ) );


@@ -98,7 +100,7 @@ int wxGenericImageList::Add( const wxBitmap &bitmap )
         m_height = bitmap.GetHeight();
     }
 
         m_height = bitmap.GetHeight();
     }
 

-    return m_images.GetCount()-1;
+    return index;

 }
 
 int wxGenericImageList::Add( const wxBitmap& bitmap, const wxBitmap& mask )
 }
 
 int wxGenericImageList::Add( const wxBitmap& bitmap, const wxBitmap& mask )