Renameing funktions to prevent name clashes

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

diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h
index 2a0893a3ac18b073195c18c390885d2b35167ad9..60f0c5d8e306fe182dbfbe9a853a3daf8441b6c0 100644 (file)
--- a/include/wx/generic/imaglist.h
+++ b/include/wx/generic/imaglist.h
@@ -40,18 +40,26 @@
 #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() { }
     wxImageList( int width, int height, bool mask = TRUE, int initialCount = 1 );
     ~wxImageList();
     bool Create();
     int GetImageCount() const;
     int Add( const wxBitmap &bitmap );
+    const wxBitmap *GetBitmap(int index) const;
     bool Replace( int index, const wxBitmap &bitmap );
     bool Remove( int index );
     bool RemoveAll();