X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..cbeda384e51acb82e13994cb67ac1714669cae10:/include/wx/os2/statbmp.h diff --git a/include/wx/os2/statbmp.h b/include/wx/os2/statbmp.h index 980a099bfd..0ea76ac9ce 100644 --- a/include/wx/os2/statbmp.h +++ b/include/wx/os2/statbmp.h @@ -6,20 +6,16 @@ // Created: 11/27/99 // RCS-ID: $Id$ // Copyright: (c) David Webster -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #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(); } @@ -51,7 +47,7 @@ class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase // 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; }