X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..644e896d3f855f2a85cc2f8bd1532b352cf30768:/include/wx/msw/statbmp.h diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h index 8920d1be7e..ae0ed7219e 100644 --- a/include/wx/msw/statbmp.h +++ b/include/wx/msw/statbmp.h @@ -20,7 +20,7 @@ #include "wx/icon.h" #include "wx/bitmap.h" -WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxStaticBitmapNameStr; // a control showing an icon or a bitmap class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase @@ -74,10 +74,7 @@ public: // ------------------------------- // implement base class virtuals -#ifdef __WIN16__ - virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item); -#endif // __WIN16__ - virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); + virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); protected: virtual wxBorder GetDefaultBorder() const; @@ -85,10 +82,10 @@ protected: virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; // ctor/dtor helpers - void Init() { m_isIcon = TRUE; m_image = NULL; } + void Init() { m_isIcon = true; m_image = NULL; } void Free(); - // TRUE if icon/bitmap is valid + // true if icon/bitmap is valid bool ImageIsOk() const; void SetImage(const wxGDIImage* image);