X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3b9e3455225b670d30ee0fb67f8821ada9640f6d..3011bf2bdce9f64a65f94ee741c9d1d163a29611:/include/wx/os2/statbmp.h?ds=sidebyside diff --git a/include/wx/os2/statbmp.h b/include/wx/os2/statbmp.h index 01ad8f183a..bc7d4e58fc 100644 --- a/include/wx/os2/statbmp.h +++ b/include/wx/os2/statbmp.h @@ -21,9 +21,8 @@ WXDLLEXPORT_DATA(extern const char*) wxStaticBitmapNameStr; -class WXDLLEXPORT wxStaticBitmap: public wxControl +class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase { - DECLARE_DYNAMIC_CLASS(wxStaticBitmap) public: inline wxStaticBitmap() { Init(); } @@ -56,11 +55,15 @@ class WXDLLEXPORT wxStaticBitmap: public wxControl // vice versa const wxIcon& GetIcon() const { wxASSERT( m_bIsIcon ); return *(wxIcon *)m_pImage; } - const wxBitmap& GetBitmap() const + wxBitmap GetBitmap() const { wxASSERT( !m_bIsIcon ); return *(wxBitmap *)m_pImage; } // overriden base class virtuals virtual bool AcceptsFocus() const { return FALSE; } + virtual MRESULT OS2WindowProc( WXUINT uMsg + ,WXWPARAM wParam + ,WXLPARAM lParam + ); protected: virtual wxSize DoGetBestSize() const; @@ -76,7 +79,9 @@ protected: // we can have either an icon or a bitmap bool m_bIsIcon; wxGDIImage* m_pImage; -}; +private: + DECLARE_DYNAMIC_CLASS(wxStaticBitmap) +}; // end of wxStaticBitmap #endif // _WX_STATBMP_H_