X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6d167489bdf17d55d9bd11be834bc17277661063..40bd6154f1476dbe598c60b4760bbf2fe0d9ab0f:/include/wx/msw/statbmp.h?ds=inline diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h index fe255032bb..fb294bbc60 100644 --- a/include/wx/msw/statbmp.h +++ b/include/wx/msw/statbmp.h @@ -18,6 +18,7 @@ #include "wx/control.h" #include "wx/icon.h" +#include "wx/bitmap.h" WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr; @@ -50,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 @@ -66,8 +67,8 @@ public: // IMPLEMENTATION #ifdef __WIN16__ virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item); - virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); #endif // __WIN16__ + virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); protected: virtual wxSize DoGetBestSize() const; @@ -78,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;