reverted Julian's unintentional breakage of wxChoice

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

diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h
index b6e68ef11e0c10ff682dc97e62034c6a57ac922e..1422f7220acb3592cc2b9c1c3f12db49ffe79713 100644 (file)
--- a/include/wx/generic/imaglist.h
+++ b/include/wx/generic/imaglist.h
@@ -1,18 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
-// 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__
 #define __IMAGELISTH_G__
 
 #ifdef __GNUG__
-#pragma interface
+#pragma interface "imaglist.h"
 #endif
 
 #include "wx/defs.h"
@@ -40,27 +40,44 @@
 #define wxIMAGELIST_DRAW_SELECTED       0x0004
 #define wxIMAGELIST_DRAW_FOCUSED        0x0008
 
-class wxImageList: public wxObject
+// 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 WXDLLEXPORT wxImageList: public wxObject
 {
-   DECLARE_DYNAMIC_CLASS(wxImageList)
-   
-  public:
+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;
+    bool GetSize( int index, int &width, int &height ) const;
 
-    wxImageList(void);
-    ~wxImageList(void);
-    bool Create(void);
-    int GetImageCount(void) const;
-    int Add( const wxBitmap &bitmap );
-    bool Replace( const int index, const wxBitmap &bitmap );
-    bool Remove( const int index );
-    bool RemoveAll(void);
-    bool GetSize( const int index, int &width, int &height ) const;
-    bool Draw(const int index, wxDC& dc, const int x, const int y,
-      const int flags = wxIMAGELIST_DRAW_NORMAL, const bool solidBackground = FALSE );
-    
-  private:
+    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 Draw(int index, wxDC& dc, int x, int y,
+              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__