X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1de4baa31f17548b32a376a71ce50fee6a3e759c..8e77fd8bca165aab9709649d79a7cbc6a172d4e1:/include/wx/os2/statbmp.h diff --git a/include/wx/os2/statbmp.h b/include/wx/os2/statbmp.h index 4f34c65d5f..b8c10e29dd 100644 --- a/include/wx/os2/statbmp.h +++ b/include/wx/os2/statbmp.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: statbmp.h +// Name: wx/os2/statbmp.h // Purpose: wxStaticBitmap class // Author: David Webster // Modified by: @@ -12,14 +12,10 @@ #ifndef _WX_STATBMP_H_ #define _WX_STATBMP_H_ -#ifdef __GNUG__ -#pragma interface "statbmp.h" -#endif - #include "wx/control.h" #include "wx/icon.h" -class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase +class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase { public: inline wxStaticBitmap() { Init(); } @@ -47,16 +43,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