X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..4b02d42e37a2fc25e16644e5276ac3df22cd1690:/include/wx/generic/imaglist.h

diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h
index 72c4f68694..4d42a170d1 100644
--- a/include/wx/generic/imaglist.h
+++ b/include/wx/generic/imaglist.h
@@ -11,55 +11,22 @@
 #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;
-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)
+class WXDLLIMPEXP_FWD_CORE wxDC;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxColour;
 
-// 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 wxGenericImageList: public wxObject
+class WXDLLIMPEXP_CORE wxGenericImageList: public wxObject
 {
 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;
@@ -68,15 +35,19 @@ public:
     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;
 
@@ -86,25 +57,26 @@ private:
     DECLARE_DYNAMIC_CLASS(wxGenericImageList)
 };
 
-#if !defined(__WXMSW__) || defined(__WIN16__) || defined(__WXUNIVERSAL__)
+#ifndef wxHAS_NATIVE_IMAGELIST
+
 /*
  * wxImageList has to be a real class or we have problems with
  * the run-time information.
  */
 
-class WXDLLEXPORT wxImageList: public wxGenericImageList
+class WXDLLIMPEXP_CORE wxImageList: public wxGenericImageList
 {
     DECLARE_DYNAMIC_CLASS(wxImageList)
 
 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 // !wxHAS_NATIVE_IMAGELIST
 
 #endif  // __IMAGELISTH_G__