X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f9d3748bc06a96750199eecccafc267f22fc80a3..c2bbeff0048b6f02bf1ef41edc6c7a3ce148f907:/include/wx/mac/statbmp.h diff --git a/include/wx/mac/statbmp.h b/include/wx/mac/statbmp.h index 62291ce3ce..67e92e96e6 100644 --- a/include/wx/mac/statbmp.h +++ b/include/wx/mac/statbmp.h @@ -16,11 +16,9 @@ #pragma interface "statbmp.h" #endif -#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: @@ -48,18 +46,21 @@ class WXDLLEXPORT wxStaticBitmap: public wxControl virtual void Command(wxCommandEvent& WXUNUSED(event)) {}; virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {}; virtual void OnPaint( wxPaintEvent &event ) ; - void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); - inline const wxBitmap& GetBitmap() const { return m_messageBitmap; } - const wxIcon& GetIcon() const { return (const wxIcon&) GetBitmap() ; } + wxBitmap GetBitmap() const { return m_bitmap; } + wxIcon GetIcon() const + { + // icons and bitmaps are really the same thing in wxMac + return (const wxIcon &)m_bitmap; + } void SetIcon(const wxIcon& icon) { SetBitmap( (const wxBitmap &)icon ) ; } // overriden base class virtuals virtual bool AcceptsFocus() const { return FALSE; } - wxSize DoGetBestSize() const ; + virtual wxSize DoGetBestSize() const ; protected: - wxBitmap m_messageBitmap; + wxBitmap m_bitmap; DECLARE_EVENT_TABLE() };