X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5b9003ae3213f487fa3be74804b426a8ad0db323..9211cf3c4304902bffc1a65ab22d60290df661bd:/include/wx/mac/carbon/imaglist.h diff --git a/include/wx/mac/carbon/imaglist.h b/include/wx/mac/carbon/imaglist.h index 2877432b26..0d4caa8468 100644 --- a/include/wx/mac/carbon/imaglist.h +++ b/include/wx/mac/carbon/imaglist.h @@ -19,43 +19,12 @@ class WXDLLEXPORT wxDC; class WXDLLEXPORT wxBitmap; class WXDLLEXPORT wxColour; -/* - * wxImageList is used for wxListCtrl, wxTreeCtrl. These controls refer to - * images for their items by an index into an image list. - * A wxImageList is capable of creating images with optional masks from - * a variety of sources - a single bitmap plus a colour to indicate the mask, - * two bitmaps, or an icon. - * - * Image lists can also create and draw images used for drag and drop functionality. - * This is not yet implemented in wxImageList. We need to discuss a generic API - * for doing drag and drop and see whether it ties in with the Win95 view of it. - * See below for candidate functions and an explanation of how they might be - * used. - */ - -#if !defined(wxIMAGELIST_DRAW_NORMAL) - -// Flags for Draw -#define wxIMAGELIST_DRAW_NORMAL 0x0001 -#define wxIMAGELIST_DRAW_TRANSPARENT 0x0002 -#define wxIMAGELIST_DRAW_SELECTED 0x0004 -#define wxIMAGELIST_DRAW_FOCUSED 0x0008 - -// Flag values for Set/GetImageList -enum { - wxIMAGE_LIST_NORMAL, // Normal icons - wxIMAGE_LIST_SMALL, // Small icons - wxIMAGE_LIST_STATE // State icons: unimplemented (see WIN32 documentation) -}; - -#endif - class WXDLLEXPORT wxImageList: public wxObject { public: wxImageList() { m_width = m_height = 0; } wxImageList( int width, int height, bool mask = true, int initialCount = 1 ); - ~wxImageList(); + virtual ~wxImageList(); bool Create( int width, int height, bool mask = true, int initialCount = 1 ); bool Create();