X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5fde6fcc9b551340a194ae4c726db5ab64b5c594..72a52d3f4ec36e1767e284cb81fe24cf32441a1d:/include/wx/mac/statbmp.h diff --git a/include/wx/mac/statbmp.h b/include/wx/mac/statbmp.h index a457c967f9..62291ce3ce 100644 --- a/include/wx/mac/statbmp.h +++ b/include/wx/mac/statbmp.h @@ -47,28 +47,16 @@ class WXDLLEXPORT wxStaticBitmap: public wxControl virtual void Command(wxCommandEvent& WXUNUSED(event)) {}; virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {}; - virtual void OnPaint( wxPaintEvent &event ) ; + virtual void OnPaint( wxPaintEvent &event ) ; void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); - inline wxBitmap& GetBitmap() const { return (wxBitmap&) m_messageBitmap; } - - // for compatibility with wxMSW - const wxIcon& GetIcon() const - { - // don't use wxDynamicCast, icons and bitmaps are really the same thing - // in wxGTK - return (const wxIcon &)m_messageBitmap; - } - - // for compatibility with wxMSW - void SetIcon(const wxIcon& icon) - { - SetBitmap( (const wxBitmap&) icon ); - } + inline const wxBitmap& GetBitmap() const { return m_messageBitmap; } + const wxIcon& GetIcon() const { return (const wxIcon&) GetBitmap() ; } + void SetIcon(const wxIcon& icon) { SetBitmap( (const wxBitmap &)icon ) ; } // overriden base class virtuals virtual bool AcceptsFocus() const { return FALSE; } - wxSize DoGetBestSize() const ; + wxSize DoGetBestSize() const ; protected: wxBitmap m_messageBitmap;