X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/os2/statbmp.h diff --git a/include/wx/os2/statbmp.h b/include/wx/os2/statbmp.h index 445b9589de..ff59f015e1 100644 --- a/include/wx/os2/statbmp.h +++ b/include/wx/os2/statbmp.h @@ -1,10 +1,9 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: statbmp.h +// Name: wx/os2/statbmp.h // Purpose: wxStaticBitmap class // Author: David Webster // Modified by: // Created: 11/27/99 -// RCS-ID: $Id$ // Copyright: (c) David Webster // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -15,7 +14,7 @@ #include "wx/control.h" #include "wx/icon.h" -class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase +class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase { public: inline wxStaticBitmap() { Init(); } @@ -43,16 +42,16 @@ class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase inline virtual ~wxStaticBitmap() { Free(); } virtual void SetIcon(const wxIcon& rIcon) { SetImage(rIcon); } - virtual void SetBitmap(const wxBitmap& rBitmap) { SetImage(rBitmap); }; + virtual void SetBitmap(const wxBitmap& rBitmap) { SetImage(rBitmap); } // assert failure is provoked by an attempt to get an icon from bitmap or // vice versa - const wxIcon& GetIcon() const + wxIcon GetIcon() const { wxASSERT( m_bIsIcon ); return *(wxIcon *)m_pImage; } wxBitmap GetBitmap() const { wxASSERT( !m_bIsIcon ); return *(wxBitmap *)m_pImage; } - // overriden base class virtuals + // overridden base class virtuals virtual bool AcceptsFocus() const { return FALSE; } virtual MRESULT OS2WindowProc( WXUINT uMsg ,WXWPARAM wParam