X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ca65c0440a7163e4e37e48b1c4329709d722db47..22574b4a9c8a805d2d476aa6f531e408b647523e:/include/wx/generic/imaglist.h diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h index 692302e433..2d6c45b244 100644 --- a/include/wx/generic/imaglist.h +++ b/include/wx/generic/imaglist.h @@ -11,12 +11,9 @@ #ifndef __IMAGELISTH_G__ #define __IMAGELISTH_G__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "imaglist.h" -#endif - #include "wx/defs.h" #include "wx/list.h" +#include "wx/icon.h" class WXDLLEXPORT wxDC; class WXDLLEXPORT wxBitmap; @@ -68,7 +65,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 +75,8 @@ public: int flags = wxIMAGELIST_DRAW_NORMAL, bool solidBackground = false); + // Internal use only + const wxBitmap *GetBitmapPtr(int index) const; private: wxList m_images;