From: Paul Cornett <paulcor@bullseye.com>
Date: Mon, 12 Jan 2009 05:39:04 +0000 (+0000)
Subject: return index of first added image in Add(), like MSW does, #10013
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0e1381f2fcfacae0f906720a51daaa67fc7eae69

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 72eb445d73..b285c15935 100644
--- a/src/generic/imaglist.cpp
+++ b/src/generic/imaglist.cpp
@@ -2,7 +2,7 @@
 // Name:        src/generic/imaglist.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $id$
+// Id:          $Id$
 // 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.") );
 
+    const int index = int(m_images.GetCount());
+
     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();
     }
 
-    return m_images.GetCount()-1;
+    return index;
 }
 
 int wxGenericImageList::Add( const wxBitmap& bitmap, const wxBitmap& mask )