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

Deprecate wxGenericImageList::GetBitmapPtr()

Browse Source 
This function was in effect deprecated since 2.5.5 (!) and it's not
finally time to do it formally and to stop using it in wxWidgets own
code.
This commit is contained in:
Vadim Zeitlin
2018-10-30 23:15:49 +01:00
parent 61e4534bd2
commit 3b5441f59e
6 changed files with 28 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/generic/imaglist.cpp
View File

@@ -112,7 +112,7 @@ int wxGenericImageList::Add( const wxBitmap& bitmap, const wxColour& maskColour
return Add(wxBitmap(img));
}
const wxBitmap *wxGenericImageList::GetBitmapPtr( int index ) const
const wxBitmap *wxGenericImageList::DoGetPtr( int index ) const
{
wxObjectList::compatibility_iterator node = m_images.Item( index );
@@ -124,7 +124,7 @@ const wxBitmap *wxGenericImageList::GetBitmapPtr( int index ) const
// Get the bitmap
wxBitmap wxGenericImageList::GetBitmap(int index) const
{
const wxBitmap* bmp = GetBitmapPtr(index);
const wxBitmap* bmp = DoGetPtr(index);
if (!bmp)
return wxNullBitmap;
@@ -137,7 +137,7 @@ wxBitmap wxGenericImageList::GetBitmap(int index) const
// Get the icon
wxIcon wxGenericImageList::GetIcon(int index) const
{
const wxBitmap* bmp = GetBitmapPtr(index);
const wxBitmap* bmp = DoGetPtr(index);
if (!bmp)
return wxNullIcon;