#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;
{
public:
wxGenericImageList() { m_width = m_height = 0; }
- wxGenericImageList( int width, int height, bool mask = TRUE, int initialCount = 1 );
- ~wxGenericImageList();
- bool Create( int width, int height, bool mask = TRUE, int initialCount = 1 );
+ wxGenericImageList( int width, int height, bool mask = true, int initialCount = 1 );
+ virtual ~wxGenericImageList();
+ bool Create( int width, int height, bool mask = true, int initialCount = 1 );
bool Create();
virtual int GetImageCount() const;
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 Replace( int index, const wxBitmap &bitmap, const wxBitmap& mask );
bool Remove( int index );
bool RemoveAll();
virtual bool Draw(int index, wxDC& dc, int x, int y,
int flags = wxIMAGELIST_DRAW_NORMAL,
- bool solidBackground = FALSE);
+ bool solidBackground = false);
+ // Internal use only
+ const wxBitmap *GetBitmapPtr(int index) const;
private:
wxList m_images;
DECLARE_DYNAMIC_CLASS(wxGenericImageList)
};
-#if !defined(__WXMSW__) || defined(__WIN16__) || defined(__WXUNIVERSAL__)
+#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)
/*
* wxImageList has to be a real class or we have problems with
* the run-time information.
public:
wxImageList() {}
- wxImageList( int width, int height, bool mask = TRUE, int initialCount = 1 )
+ wxImageList( int width, int height, bool mask = true, int initialCount = 1 )
: wxGenericImageList(width, height, mask, initialCount)
{
}
};
-#endif // !__WXMSW__ || __WIN16__ || __WXUNIVERSAL__
+#endif // !__WXMSW__ || __WXUNIVERSAL__
#endif // __IMAGELISTH_G__