diff --git a/include/wx/generic/imaglist.h b/include/wx/generic/imaglist.h index b6e68ef11e..2007ffc5c0 100644 --- a/include/wx/generic/imaglist.h +++ b/include/wx/generic/imaglist.h @@ -46,17 +46,18 @@ class wxImageList: public wxObject public: - wxImageList(void); - ~wxImageList(void); - bool Create(void); - int GetImageCount(void) const; + wxImageList::wxImageList() { } + wxImageList(int width, int height, bool mask = TRUE, int initialCount = 1); + ~wxImageList(); + bool Create(); + int GetImageCount() 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 ); + 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 ); private: diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp index 368a72735a..dffb5f530d 100644 --- a/src/generic/imaglist.cpp +++ b/src/generic/imaglist.cpp @@ -20,21 +20,21 @@ IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject) -wxImageList::wxImageList(void) +wxImageList::wxImageList(int width, int height, bool mask, int initialCount) { Create(); }; -wxImageList::~wxImageList(void) +wxImageList::~wxImageList() { }; -int wxImageList::GetImageCount(void) const +int wxImageList::GetImageCount() const { return m_images.Number(); }; -bool wxImageList::Create(void) +bool wxImageList::Create() { m_images.DeleteContents( TRUE ); return TRUE; @@ -46,7 +46,7 @@ int wxImageList::Add( const wxBitmap &bitmap ) return m_images.Number(); }; -bool wxImageList::Replace( const int index, const wxBitmap &bitmap ) +bool wxImageList::Replace( int index, const wxBitmap &bitmap ) { wxNode *node = m_images.Nth( index ); if (!node) return FALSE; @@ -66,20 +66,20 @@ bool wxImageList::Replace( const int index, const wxBitmap &bitmap ) return TRUE; }; -bool wxImageList::Remove( const int index ) +bool wxImageList::Remove( int index ) { wxNode *node = m_images.Nth( index ); if (node) m_images.DeleteNode( node ); return (node != NULL); }; -bool wxImageList::RemoveAll(void) +bool wxImageList::RemoveAll() { m_images.Clear(); return TRUE; }; -bool wxImageList::GetSize( const int index, int &width, int &height ) const +bool wxImageList::GetSize( int index, int &width, int &height ) const { wxNode *node = m_images.Nth( index ); if (node) @@ -97,9 +97,9 @@ bool wxImageList::GetSize( const int index, int &width, int &height ) const }; }; -bool wxImageList::Draw( const int index, wxDC &dc, - const int x, const int y, - const int WXUNUSED(flags), const bool WXUNUSED(solidBackground) ) +bool wxImageList::Draw( int index, wxDC &dc, + int x, int y, + int WXUNUSED(flags), const bool WXUNUSED(solidBackground) ) { wxNode *node = m_images.Nth( index ); if (!node) return FALSE;