fixed virtual function hiding for LoadBitmap()

[wxWidgets.git] / include / wx / generic / imaglist.h

diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h
index 692302e433a1b66940e81f63afceb34ae3ac54fb..3717de96b0c07742969d905a2edb951d5e21d9d6 100644 (file)
--- a/include/wx/generic/imaglist.h
+++ b/include/wx/generic/imaglist.h
@@ -17,6 +17,7 @@
 
 #include "wx/defs.h"
 #include "wx/list.h"
+#include "wx/icon.h"
 
 class WXDLLEXPORT wxDC;
 class WXDLLEXPORT wxBitmap;
@@ -68,7 +69,8 @@ public:
     int Add( const wxBitmap& bitmap );
     int Add( const wxBitmap& bitmap, const wxBitmap& mask );
     int Add( const wxBitmap& bitmap, const wxColour& maskColour );
-    const wxBitmap *GetBitmap(int index) const;
+    wxBitmap GetBitmap(int index) const;
+    wxIcon GetIcon(int index) const;
     bool Replace( int index, const wxBitmap &bitmap );
     bool Remove( int index );
     bool RemoveAll();
@@ -77,6 +79,8 @@ public:
               int flags = wxIMAGELIST_DRAW_NORMAL,
               bool solidBackground = false);
 
+    // Internal use only
+    const wxBitmap *GetBitmapPtr(int index) const;
 private:
     wxList  m_images;