X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/584bede0618774ad7f62476c9adddeb9776fb737..57fbe23f68f9ef92b8ef7e26bd06b399b53e33b2:/include/wx/mac/statbmp.h?ds=inline diff --git a/include/wx/mac/statbmp.h b/include/wx/mac/statbmp.h index 3ae276eaff..04b36469bf 100644 --- a/include/wx/mac/statbmp.h +++ b/include/wx/mac/statbmp.h @@ -12,7 +12,7 @@ #ifndef _WX_STATBMP_H_ #define _WX_STATBMP_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "statbmp.h" #endif @@ -45,8 +45,7 @@ class WXDLLEXPORT wxStaticBitmap: public wxStaticBitmapBase 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); + void OnPaint( wxPaintEvent &event ) ; wxBitmap GetBitmap() const { return m_bitmap; } wxIcon GetIcon() const @@ -58,7 +57,7 @@ class WXDLLEXPORT wxStaticBitmap: public wxStaticBitmapBase // overriden base class virtuals virtual bool AcceptsFocus() const { return FALSE; } - wxSize DoGetBestSize() const ; + virtual wxSize DoGetBestSize() const ; protected: wxBitmap m_bitmap;