X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/210a651b4f4ef5ff4e220a100a10bb4f29e08cfd..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/os2/statbmp.h diff --git a/include/wx/os2/statbmp.h b/include/wx/os2/statbmp.h index 116e25034d..3028147429 100644 --- a/include/wx/os2/statbmp.h +++ b/include/wx/os2/statbmp.h @@ -12,15 +12,9 @@ #ifndef _WX_STATBMP_H_ #define _WX_STATBMP_H_ -#ifdef __GNUG__ -#pragma interface "statbmp.h" -#endif - #include "wx/control.h" #include "wx/icon.h" -WXDLLEXPORT_DATA(extern const char*) wxStaticBitmapNameStr; - class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase { public: @@ -53,13 +47,18 @@ 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; } // 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; @@ -77,7 +76,8 @@ protected: wxGDIImage* m_pImage; private: DECLARE_DYNAMIC_CLASS(wxStaticBitmap) -}; + DECLARE_EVENT_TABLE() +}; // end of wxStaticBitmap #endif // _WX_STATBMP_H_