1. wxStaticBitmap now uses mask even for bitmaps (and not only icons)
2. we now catch WM_SYSKEYDOWN/UP events as well as normal ones git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -51,8 +51,8 @@ public:
|
||||
|
||||
virtual ~wxStaticBitmap() { Free(); }
|
||||
|
||||
void SetIcon(const wxIcon& icon) { SetImage(icon); }
|
||||
void SetBitmap(const wxBitmap& bitmap) { SetImage(bitmap); }
|
||||
void SetIcon(const wxIcon& icon) { SetImage(&icon); }
|
||||
void SetBitmap(const wxBitmap& bitmap) { SetImage(&bitmap); }
|
||||
|
||||
// assert failure is provoked by an attempt to get an icon from bitmap or
|
||||
// vice versa
|
||||
@@ -79,7 +79,7 @@ protected:
|
||||
// TRUE if icon/bitmap is valid
|
||||
bool ImageIsOk() const;
|
||||
|
||||
void SetImage(const wxGDIImage& image);
|
||||
void SetImage(const wxGDIImage* image);
|
||||
|
||||
// we can have either an icon or a bitmap
|
||||
bool m_isIcon;
|
||||
|
Reference in New Issue
Block a user