X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f45fac95d6067ed7d08b890b98e9bc6033bbb05e..538f3830191e25eaf0edb0a379e08d4f85ee49bc:/include/wx/generic/imaglist.h diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h index 3717de96b0..32870b1cad 100644 --- a/include/wx/generic/imaglist.h +++ b/include/wx/generic/imaglist.h @@ -11,10 +11,6 @@ #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" @@ -59,7 +55,7 @@ class WXDLLEXPORT wxGenericImageList: public wxObject public: wxGenericImageList() { m_width = m_height = 0; } wxGenericImageList( int width, int height, bool mask = true, int initialCount = 1 ); - ~wxGenericImageList(); + virtual ~wxGenericImageList(); bool Create( int width, int height, bool mask = true, int initialCount = 1 ); bool Create(); @@ -72,6 +68,7 @@ public: wxBitmap GetBitmap(int index) const; wxIcon GetIcon(int index) const; bool Replace( int index, const wxBitmap &bitmap ); + bool Replace( int index, const wxBitmap &bitmap, const wxBitmap& mask ); bool Remove( int index ); bool RemoveAll();