X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/49bf4e3e689c2131994aa2aab3c9eca6255a46eb..c764029c20f8edf64dcbe9fc3649773c3063227a:/include/wx/generic/imaglist.h diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h index 11e51fbe9d..32870b1cad 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; @@ -58,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(); @@ -71,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();