* Fixed wxStaticBitmap::SetBitmap so that it does not ignore the mask

* Hopefully made possible use SetBitmap with as wxSB created with an icon
  and SetIcon with a wxSB created with a bitmap


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2001-11-06 21:16:02 +00:00
parent e37177c27b
commit d8bffc1335
2 changed files with 56 additions and 31 deletions

View File

@@ -75,6 +75,7 @@ protected:
bool ImageIsOk() const;
void SetImage(const wxGDIImage* image);
void SetImageNoCopy( wxGDIImage* image );
// we can have either an icon or a bitmap
bool m_isIcon;