X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d3820b348955b748fa0ab3076f4ed9763ce4bee..d015713e787da8241e92ff86ee2e911868b8024c:/include/wx/generic/imaglist.h

diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h
index 3df017802e..390a498328 100644
--- a/include/wx/generic/imaglist.h
+++ b/include/wx/generic/imaglist.h
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        imaglist.h
+// Name:        wx/generic/imaglist.h
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Id:
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __IMAGELISTH_G__
@@ -40,28 +40,44 @@
 #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)
+};
+
 class wxImageList: public wxObject
 {
-   DECLARE_DYNAMIC_CLASS(wxImageList)
-   
-  public:
-
-    wxImageList::wxImageList() { }
-    wxImageList(int width, int height, bool mask = TRUE, int initialCount = 1);
+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 );
     bool Create();
+
     int GetImageCount() const;
-    int Add( const wxBitmap &bitmap );
+    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;
     bool Replace( int index, const wxBitmap &bitmap );
     bool Remove( int index );
     bool RemoveAll();
-    bool GetSize( int index, int &width, int &height ) const;
+
     bool Draw(int index, wxDC& dc, int x, int y,
-      int flags = wxIMAGELIST_DRAW_NORMAL, const bool solidBackground = FALSE );
-    
-  private:
+              int flags = wxIMAGELIST_DRAW_NORMAL,
+              bool solidBackground = FALSE);
 
+private:
     wxList  m_images;
+
+    int     m_width;
+    int     m_height;
+
+    DECLARE_DYNAMIC_CLASS(wxImageList)
 };
 
 #endif  // __IMAGELISTH_G__