Patch from Hartwig and me for implementing reorderable dataview columns. Works on...

[wxWidgets.git] / include / wx / mac / carbon / imaglist.h

diff --git a/include/wx/mac/carbon/imaglist.h b/include/wx/mac/carbon/imaglist.h
index 801a805a18473051ba3978bba9b889875bd1daa5..59bfe6261d544151c4b57c58b5c791c3f4681d04 100644 (file)
--- a/include/wx/mac/carbon/imaglist.h
+++ b/include/wx/mac/carbon/imaglist.h
@@ -11,55 +11,20 @@
 #ifndef _WX_IMAGLIST_H_
 #define _WX_IMAGLIST_H_
 
 #ifndef _WX_IMAGLIST_H_
 #define _WX_IMAGLIST_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "imaglist.h"
-#endif
-

 #include "wx/defs.h"
 #include "wx/list.h"
 #include "wx/icon.h"
 
 #include "wx/defs.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
- * 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 WXDLLIMPEXP_FWD_CORE wxDC;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxColour;

 
 class WXDLLEXPORT wxImageList: public wxObject
 {
 public:
     wxImageList() { m_width = m_height = 0; }
     wxImageList( int width, int height, bool mask = true, int initialCount = 1 );
 
 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();
     
     bool Create( int width, int height, bool mask = true, int initialCount = 1 );
     bool Create();
     


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