Fixed GetIcon to keep up with return type change on all other platforms.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
024026be1d
commit
ea8ca011a3
@ -47,7 +47,7 @@ class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase
|
|||||||
|
|
||||||
// assert failure is provoked by an attempt to get an icon from bitmap or
|
// assert failure is provoked by an attempt to get an icon from bitmap or
|
||||||
// vice versa
|
// vice versa
|
||||||
const wxIcon& GetIcon() const
|
wxIcon GetIcon() const
|
||||||
{ wxASSERT( m_bIsIcon ); return *(wxIcon *)m_pImage; }
|
{ wxASSERT( m_bIsIcon ); return *(wxIcon *)m_pImage; }
|
||||||
wxBitmap GetBitmap() const
|
wxBitmap GetBitmap() const
|
||||||
{ wxASSERT( !m_bIsIcon ); return *(wxBitmap *)m_pImage; }
|
{ wxASSERT( !m_bIsIcon ); return *(wxBitmap *)m_pImage; }
|
||||||
|
Loading…
Reference in New Issue
Block a user