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

Deprecate useless wxGenericImageList::Create() overload

Browse Source 
This overload doesn't do anything and doesn't exist in the MSW version,
so deprecate it.
This commit is contained in:
Vadim Zeitlin
2018-10-30 22:47:21 +01:00
parent 28e9ea6bd6
commit 61e4534bd2
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,6 @@ public:
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 );
bool Create();
virtual int GetImageCount() const; virtual int GetImageCount() const;
virtual bool GetSize( int index, int &width, int &height ) const; virtual bool GetSize( int index, int &width, int &height ) const;
@@ -45,6 +44,11 @@ public:
int flags = wxIMAGELIST_DRAW_NORMAL, int flags = wxIMAGELIST_DRAW_NORMAL,
bool solidBackground = false); bool solidBackground = false);
#if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED_MSG("Don't use this overload: it's not portable and does nothing")
bool Create() { return true; }
#endif // WXWIN_COMPATIBILITY_3_0
// Internal use only // Internal use only
const wxBitmap *GetBitmapPtr(int index) const; const wxBitmap *GetBitmapPtr(int index) const;
private: private:

5
src/generic/imaglist.cpp
View File

@@ -49,11 +49,6 @@ bool wxGenericImageList::Create( int width, int height, bool WXUNUSED(mask), int
{ {
m_size = wxSize(width, height); m_size = wxSize(width, height);
return Create();
}
bool wxGenericImageList::Create()
{
return true; return true;
} }