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

wxImageList::GetIcon() converts wxBitmap to wxIcon instead of wxNullIcon on OSX (#906)

Browse Source 
On OSX, wxImageList::GetIcon() returned wxNullIcon when a wxBitmap was
stored. This could lead to no image seen in controls like wxTreeListCtrl.

Instead of that, we convert the wxBitmap to wxIcon with CopyFromBitmap.
This commit is contained in:
F
2018-09-01 11:33:03 +02:00
committed by Stefan Csomor
parent 0b69ba6459
commit d2c77146db
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/osx/imaglist.cpp
View File

@@ -147,13 +147,13 @@ wxIcon wxImageList::GetIcon(int index) const
wxObject* obj = (wxObject*) node->GetData(); wxObject* obj = (wxObject*) node->GetData();
if ( obj == NULL ) if ( obj == NULL )
return wxNullIcon ; return wxNullIcon ;
else if ( obj->IsKindOf(CLASSINFO(wxBitmap)) ) if ( obj->IsKindOf(CLASSINFO(wxBitmap)) )
{ {
wxFAIL_MSG( wxT("cannot convert from bitmap to icon") ) ; wxIcon icon;
return wxNullIcon ; icon.CopyFromBitmap(*static_cast<const wxBitmap*>(obj));
return icon;
} }
else return *(static_cast<wxIcon*>(obj)) ;
return *(static_cast<wxIcon*>(obj)) ;
} }
bool wxImageList::Replace( int index, const wxBitmap &bitmap ) bool wxImageList::Replace( int index, const wxBitmap &bitmap )