// Author: Robert Roebling
// Created: 01/02/97
// Id:
-// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright: (c) 1998 Robert Roebling and Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __IMAGELISTH_G__
#define __IMAGELISTH_G__
-#ifdef __GNUG__
-#pragma interface "imaglist.h"
-#endif
-
#include "wx/defs.h"
-#include "wx/gdicmn.h"
-#include "wx/bitmap.h"
-#include "wx/dc.h"
+#include "wx/list.h"
+#include "wx/icon.h"
+
+class WXDLLEXPORT wxDC;
+class WXDLLEXPORT wxBitmap;
+class WXDLLEXPORT wxColour;
/*
* wxImageList is used for wxListCtrl, wxTreeCtrl. These controls refer to
* used.
*/
+#if !defined(wxIMAGELIST_DRAW_NORMAL)
+
// Flags for Draw
#define wxIMAGELIST_DRAW_NORMAL 0x0001
#define wxIMAGELIST_DRAW_TRANSPARENT 0x0002
wxIMAGE_LIST_STATE // State icons: unimplemented (see WIN32 documentation)
};
-class wxImageList: public wxObject
+#endif
+
+class WXDLLEXPORT wxGenericImageList: public wxObject
{
public:
- wxImageList() { }
- wxImageList( int width, int height, bool mask = TRUE, int initialCount = 1 );
- ~wxImageList();
- bool Create( int width, int height, bool mask = TRUE, int initialCount = 1 );
+ wxGenericImageList() { m_width = m_height = 0; }
+ 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();
- int GetImageCount() const;
- bool GetSize( int index, int &width, int &height ) const;
+ virtual int GetImageCount() const;
+ virtual bool GetSize( int index, int &width, int &height ) 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();
- bool Draw(int index, wxDC& dc, int x, int y,
+ 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;
int m_width;
int m_height;
+ DECLARE_DYNAMIC_CLASS(wxGenericImageList)
+};
+
+#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)
+/*
+ * wxImageList has to be a real class or we have problems with
+ * the run-time information.
+ */
+
+class WXDLLEXPORT wxImageList: public wxGenericImageList
+{
DECLARE_DYNAMIC_CLASS(wxImageList)
+
+public:
+ wxImageList() {}
+
+ wxImageList( int width, int height, bool mask = true, int initialCount = 1 )
+ : wxGenericImageList(width, height, mask, initialCount)
+ {
+ }
};
+#endif // !__WXMSW__ || __WXUNIVERSAL__
#endif // __IMAGELISTH_G__