X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..b50747ea53f4a9906d572d4bca4e452e66c8dbd5:/include/wx/mac/carbon/statbmp.h diff --git a/include/wx/mac/carbon/statbmp.h b/include/wx/mac/carbon/statbmp.h index 146987f0a1..4841947522 100644 --- a/include/wx/mac/carbon/statbmp.h +++ b/include/wx/mac/carbon/statbmp.h @@ -6,25 +6,21 @@ // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #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() };