X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8cf73271dd6f442a98e86b559d4a55c37e25b99f..ea098413d0e9c3f794f43826137a636e229f26f9:/include/wx/mac/carbon/statbmp.h?ds=sidebyside diff --git a/include/wx/mac/carbon/statbmp.h b/include/wx/mac/carbon/statbmp.h index 8a16726c57..4841947522 100644 --- a/include/wx/mac/carbon/statbmp.h +++ b/include/wx/mac/carbon/statbmp.h @@ -12,19 +12,15 @@ #ifndef _WX_STATBMP_H_ #define _WX_STATBMP_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "statbmp.h" -#endif - #include "wx/icon.h" class WXDLLEXPORT wxStaticBitmap: public wxStaticBitmapBase { DECLARE_DYNAMIC_CLASS(wxStaticBitmap) public: - inline wxStaticBitmap() { } + wxStaticBitmap() { } - inline wxStaticBitmap(wxWindow *parent, wxWindowID id, + wxStaticBitmap(wxWindow *parent, wxWindowID id, const wxBitmap& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -57,10 +53,11 @@ class WXDLLEXPORT wxStaticBitmap: public wxStaticBitmapBase // overriden base class virtuals virtual bool AcceptsFocus() const { return FALSE; } - virtual wxSize DoGetBestSize() const ; protected: - wxBitmap m_bitmap; + virtual wxSize DoGetBestSize() const; + + wxBitmap m_bitmap; DECLARE_EVENT_TABLE() };