don't use -single_module together with -bundle under Darwin (ld gives an error for...

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

diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h
index b93217f190a01a54006c308959729de2ba5d294f..2d6c45b244694299371a7aea9c37e453959f69f3 100644 (file)
--- a/include/wx/generic/imaglist.h
+++ b/include/wx/generic/imaglist.h
@@ -5,18 +5,15 @@
 // Created:     01/02/97
 // Id:
 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #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;
@@ -57,9 +54,9 @@ class WXDLLEXPORT wxGenericImageList: public wxObject
 {
 public:
     wxGenericImageList() { m_width = m_height = 0; }
-    wxGenericImageList( int width, int height, bool mask = TRUE, int initialCount = 1 );
+    wxGenericImageList( int width, int height, bool mask = true, int initialCount = 1 );
     ~wxGenericImageList();
-    bool Create( int width, int height, bool mask = TRUE, int initialCount = 1 );
+    bool Create( int width, int height, bool mask = true, int initialCount = 1 );
     bool Create();
 
     virtual int GetImageCount() const;
@@ -68,15 +65,18 @@ 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 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;
 
@@ -99,7 +99,7 @@ class WXDLLEXPORT wxImageList: public wxGenericImageList
 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)
     {
     }