X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/59af881e445d3343b0ab5ed24f92d21a524c5a9f..ca77701441e39245dcbfce903049e76f166979e5:/include/wx/msw/imaglist.h diff --git a/include/wx/msw/imaglist.h b/include/wx/msw/imaglist.h index dce0618369..73fc9df729 100644 --- a/include/wx/msw/imaglist.h +++ b/include/wx/msw/imaglist.h @@ -12,44 +12,13 @@ #ifndef _WX_IMAGLIST_H_ #define _WX_IMAGLIST_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "imaglist.h" -#endif - #include "wx/bitmap.h" -/* - * 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. - */ - -// 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) -}; - // Eventually we'll make this a reference-counted wxGDIObject. For // now, the app must take care of ownership issues. That is, the // image lists must be explicitly deleted after the control(s) that uses them // is (are) deleted, or when the app exits. -class WXDLLEXPORT wxImageList : public wxObject +class WXDLLIMPEXP_CORE wxImageList : public wxObject { public: /* @@ -66,7 +35,7 @@ public: { Create(width, height, mask, initialCount); } - ~wxImageList(); + virtual ~wxImageList(); // Attributes @@ -130,6 +99,12 @@ public: int flags = wxIMAGELIST_DRAW_NORMAL, bool solidBackground = false); + // Get a bitmap + wxBitmap GetBitmap(int index) const; + + // Get an icon + wxIcon GetIcon(int index) const; + // TODO: miscellaneous functionality /* wxIcon *MakeIcon(int index); @@ -224,7 +199,7 @@ public: protected: WXHIMAGELIST m_hImageList; - DECLARE_DYNAMIC_CLASS(wxImageList) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxImageList) }; #endif