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 692302e433a1b66940e81f63afceb34ae3ac54fb..2d6c45b244694299371a7aea9c37e453959f69f3 100644 (file)
--- a/include/wx/generic/imaglist.h
+++ b/include/wx/generic/imaglist.h
@@ -11,12 +11,9 @@
 #ifndef __IMAGELISTH_G__
 #define __IMAGELISTH_G__
 
 #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/defs.h"
 #include "wx/list.h"

+#include "wx/icon.h"

 
 class WXDLLEXPORT wxDC;
 class WXDLLEXPORT wxBitmap;
 
 class WXDLLEXPORT wxDC;
 class WXDLLEXPORT wxBitmap;


@@ -68,7 +65,8 @@ public:
     int Add( const wxBitmap& bitmap );
     int Add( const wxBitmap& bitmap, const wxBitmap& mask );
     int Add( const wxBitmap& bitmap, const wxColour& maskColour );
     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();
     bool Replace( int index, const wxBitmap &bitmap );
     bool Remove( int index );
     bool RemoveAll();


@@ -77,6 +75,8 @@ public:
               int flags = wxIMAGELIST_DRAW_NORMAL,
               bool solidBackground = false);
 
               int flags = wxIMAGELIST_DRAW_NORMAL,
               bool solidBackground = false);
 

+    // Internal use only
+    const wxBitmap *GetBitmapPtr(int index) const;

 private:
     wxList  m_images;
 
 private:
     wxList  m_images;