correction for Mac OS X

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

diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h
index 2a0893a3ac18b073195c18c390885d2b35167ad9..390a49832883b4b161715cdafb00e4e271c0d6f0 100644 (file)
--- a/include/wx/generic/imaglist.h
+++ b/include/wx/generic/imaglist.h
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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
 // 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__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __IMAGELISTH_G__


@@ -40,30 +40,44 @@
 #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
 {
 class wxImageList: public wxObject
 {

-   DECLARE_DYNAMIC_CLASS(wxImageList)
-   
-  public:
-
-    wxImageList::wxImageList() { }
+public:
+    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 width, int height, bool mask = TRUE, int initialCount = 1 );

     bool Create();
     bool Create();

+

     int GetImageCount() const;
     int GetImageCount() const;

-    int Add( const wxBitmap &bitmap );
+    bool GetSize( int index, int &width, int &height ) const;
+
+    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 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, bool solidBackground = FALSE );

 
 

-  private:
+    bool Draw(int index, wxDC& dc, int x, int y,
+              int flags = wxIMAGELIST_DRAW_NORMAL,
+              bool solidBackground = FALSE);

 
 

+private:

     wxList  m_images;
     wxList  m_images;

+

     int     m_width;
     int     m_height;
     int     m_width;
     int     m_height;

+
+    DECLARE_DYNAMIC_CLASS(wxImageList)

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