Chnaged includes to work without precompiled headers

[wxWidgets.git] / include / wx / generic / imaglist.h

diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h
index 3df017802e398f1ee452fa1651ef0e1fed96c009..e65e1787c764957eaf5bfd54fa30421c419e27d0 100644 (file)
--- a/include/wx/generic/imaglist.h
+++ b/include/wx/generic/imaglist.h
@@ -40,28 +40,40 @@
 #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);
+    wxImageList() { }
+    wxImageList( int width, int height, bool mask = TRUE, int initialCount = 1 );
     ~wxImageList();
     bool Create();
     int GetImageCount() const;
-    int Add( const wxBitmap &bitmap );
+    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 );
-    
+      int flags = wxIMAGELIST_DRAW_NORMAL, bool solidBackground = FALSE );
+
   private:
 
     wxList  m_images;
+    int     m_width;
+    int     m_height;
 };
 
 #endif  // __IMAGELISTH_G__