remove unneeded DoGetClientSize

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

diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h
index 2d6c45b244694299371a7aea9c37e453959f69f3..32870b1cad78bc94475ac984d8870c87bcb24eef 100644 (file)
--- a/include/wx/generic/imaglist.h
+++ b/include/wx/generic/imaglist.h
@@ -55,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 );
 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();
 
     bool Create( int width, int height, bool mask = true, int initialCount = 1 );
     bool Create();
 


@@ -68,6 +68,7 @@ public:
     wxBitmap GetBitmap(int index) const;
     wxIcon GetIcon(int index) const;
     bool Replace( int index, const wxBitmap &bitmap );
     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();
 
     bool Remove( int index );
     bool RemoveAll();