X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3b9e3455225b670d30ee0fb67f8821ada9640f6d..af79064d318dc0858af706d0d1b4569e24a612c4:/include/wx/os2/statbmp.h diff --git a/include/wx/os2/statbmp.h b/include/wx/os2/statbmp.h index 01ad8f183a..4f34c65d5f 100644 --- a/include/wx/os2/statbmp.h +++ b/include/wx/os2/statbmp.h @@ -19,11 +19,8 @@ #include "wx/control.h" #include "wx/icon.h" -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 +53,16 @@ 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 + ); + void OnPaint(wxPaintEvent& rEvent); protected: virtual wxSize DoGetBestSize() const; @@ -76,7 +78,10 @@ protected: // we can have either an icon or a bitmap bool m_bIsIcon; wxGDIImage* m_pImage; -}; +private: + DECLARE_DYNAMIC_CLASS(wxStaticBitmap) + DECLARE_EVENT_TABLE() +}; // end of wxStaticBitmap #endif // _WX_STATBMP_H_