X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6aa0103384e632ea2106bf61000dc78b976064c1..b80e8ac983cb2f552abb5806c87839a83020725b:/include/wx/msw/statbmp.h diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h index ae0ed7219e..d580d8a731 100644 --- a/include/wx/msw/statbmp.h +++ b/include/wx/msw/statbmp.h @@ -12,10 +12,6 @@ #ifndef _WX_STATBMP_H_ #define _WX_STATBMP_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "statbmp.h" -#endif - #include "wx/control.h" #include "wx/icon.h" #include "wx/bitmap.h" @@ -53,28 +49,9 @@ public: virtual void SetIcon(const wxIcon& icon) { SetImage(&icon); } virtual void SetBitmap(const wxBitmap& bitmap) { SetImage(&bitmap); } + virtual wxBitmap GetBitmap() const; + virtual wxIcon GetIcon() const; - // assert failure is provoked by an attempt to get an icon from bitmap or - // vice versa - wxIcon GetIcon() const - { - wxASSERT_MSG( m_isIcon, _T("no icon in this wxStaticBitmap") ); - - return *(wxIcon *)m_image; - } - - wxBitmap GetBitmap() const - { - wxASSERT_MSG( !m_isIcon, _T("no bitmap in this wxStaticBitmap") ); - - return *(wxBitmap *)m_image; - } - - // implementation only from now on - // ------------------------------- - - // implement base class virtuals - virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); protected: virtual wxBorder GetDefaultBorder() const;