Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxImageList::Create(width, height) added, as in wxMSW

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-05-28 22:01:21 +00:00
parent eff56bb979
commit b6276d5829
2 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/wx/generic/imaglist.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: imaglist.h // Name: wx/generic/imaglist.h
// Purpose: // Purpose:
// Author: Robert Roebling // Author: Robert Roebling
// Created: 01/02/97 // Created: 01/02/97
@@ -49,15 +49,16 @@ enum {
class wxImageList: public wxObject class wxImageList: public wxObject
{ {
DECLARE_DYNAMIC_CLASS(wxImageList) public:
public:
wxImageList() { } wxImageList() { }
wxImageList( int width, int height, bool mask = TRUE, int initialCount = 1 ); wxImageList( int width, int height, bool mask = TRUE, int initialCount = 1 );
~wxImageList(); ~wxImageList();
bool Create( int width, int height, bool mask = TRUE, int initialCount = 1 );
bool Create(); bool Create();
int GetImageCount() const; int GetImageCount() const;
bool GetSize( int index, int &width, int &height ) const;
int Add( const wxBitmap& bitmap ); int Add( const wxBitmap& bitmap );
int Add( const wxBitmap& bitmap, const wxBitmap& mask ); int Add( const wxBitmap& bitmap, const wxBitmap& mask );
int Add( const wxBitmap& bitmap, const wxColour& maskColour ); int Add( const wxBitmap& bitmap, const wxColour& maskColour );
@@ -65,15 +66,18 @@ class wxImageList: public wxObject
bool Replace( int index, const wxBitmap &bitmap ); bool Replace( int index, const wxBitmap &bitmap );
bool Remove( int index ); bool Remove( int index );
bool RemoveAll(); bool RemoveAll();
bool GetSize( int index, int &width, int &height ) const;
bool Draw(int index, wxDC& dc, int x, int y, bool Draw(int index, wxDC& dc, int x, int y,
int flags = wxIMAGELIST_DRAW_NORMAL, bool solidBackground = FALSE ); int flags = wxIMAGELIST_DRAW_NORMAL,
bool solidBackground = FALSE);
private:
private:
wxList m_images; wxList m_images;
int m_width; int m_width;
int m_height; int m_height;
DECLARE_DYNAMIC_CLASS(wxImageList)
}; };
#endif // __IMAGELISTH_G__ #endif // __IMAGELISTH_G__

16
src/generic/imaglist.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: imaglist.cpp // Name: generic/imaglist.cpp
// Purpose: // Purpose:
// Author: Robert Roebling // Author: Robert Roebling
// Id: $id$ // Id: $id$
@@ -28,11 +28,9 @@
IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject)
wxImageList::wxImageList( int width, int height, bool WXUNUSED(mask), int WXUNUSED(initialCount) ) wxImageList::wxImageList( int width, int height, bool mask, int initialCount )
{ {
m_width = width; (void)Create(width, height, mask, initialCount);
m_height = height;
Create();
} }
wxImageList::~wxImageList() wxImageList::~wxImageList()
@@ -44,6 +42,14 @@ int wxImageList::GetImageCount() const
return m_images.Number(); return m_images.Number();
} }
bool wxImageList::Create( int width, int height, bool WXUNUSED(mask), int WXUNUSED(initialCount) )
{
m_width = width;
m_height = height;
return Create();
}
bool wxImageList::Create() bool wxImageList::Create()
{ {
m_images.DeleteContents( TRUE ); m_images.DeleteContents( TRUE );