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

Initialize wxGenericImageList members in default ctor

Browse Source 
Don't leave m_useMask and m_scaleFactor uninitialized -- even if this
probably doesn't matter, call Create() to make sure they have
well-defined values for the default-constructed objects.
This commit is contained in:
Vadim Zeitlin
2021-10-17 01:00:19 +01:00
parent 6fb64da922
commit 6b3fd04e24
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,7 @@ class WXDLLIMPEXP_FWD_CORE wxColour;
class WXDLLIMPEXP_CORE wxGenericImageList: public wxObject class WXDLLIMPEXP_CORE wxGenericImageList: public wxObject
{ {
public: public:
wxGenericImageList() { } wxGenericImageList();
wxGenericImageList( int width, int height, bool mask = true, int initialCount = 1 ); wxGenericImageList( int width, int height, bool mask = true, int initialCount = 1 );
virtual ~wxGenericImageList(); virtual ~wxGenericImageList();
bool Create( int width, int height, bool mask = true, int initialCount = 1 ); bool Create( int width, int height, bool mask = true, int initialCount = 1 );

5
src/generic/imaglist.cpp
View File

@@ -29,6 +29,11 @@
wxIMPLEMENT_DYNAMIC_CLASS(wxGenericImageList, wxObject); wxIMPLEMENT_DYNAMIC_CLASS(wxGenericImageList, wxObject);
wxIMPLEMENT_DYNAMIC_CLASS(wxImageList, wxGenericImageList); wxIMPLEMENT_DYNAMIC_CLASS(wxImageList, wxGenericImageList);
wxGenericImageList::wxGenericImageList()
{
Create(0, 0, false);
}
wxGenericImageList::wxGenericImageList( int width, int height, bool mask, int initialCount ) wxGenericImageList::wxGenericImageList( int width, int height, bool mask, int initialCount )
{ {
(void)Create(width, height, mask, initialCount); (void)Create(width, height, mask, initialCount);