Removed unnecessary code from utilsunx.cpp

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

diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h
index 2007ffc5c0e903c89c5543d8f9b7c2fa61f741fc..60f0c5d8e306fe182dbfbe9a853a3daf8441b6c0 100644 (file)
--- a/include/wx/generic/imaglist.h
+++ b/include/wx/generic/imaglist.h
@@ -12,7 +12,7 @@
 #define __IMAGELISTH_G__
 
 #ifdef __GNUG__
 #define __IMAGELISTH_G__
 
 #ifdef __GNUG__

-#pragma interface
+#pragma interface "imaglist.h"

 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"


@@ -40,28 +40,38 @@
 #define wxIMAGELIST_DRAW_SELECTED       0x0004
 #define wxIMAGELIST_DRAW_FOCUSED        0x0008
 
 #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:
 
 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 );
     ~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();
     bool GetSize( int index, int &width, int &height ) const;
     bool Draw(int index, wxDC& dc, int x, int y,
     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;
   private:
 
     wxList  m_images;

+    int     m_width;
+    int     m_height;

 };
 
 #endif  // __IMAGELISTH_G__
 };
 
 #endif  // __IMAGELISTH_G__