X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/584bede0618774ad7f62476c9adddeb9776fb737..4c3ebca927cea2742ec128c9c3ef3676d1ecae01:/include/wx/mac/statbmp.h?ds=sidebyside diff --git a/include/wx/mac/statbmp.h b/include/wx/mac/statbmp.h index 3ae276eaff..55879e17fb 100644 --- a/include/wx/mac/statbmp.h +++ b/include/wx/mac/statbmp.h @@ -1,18 +1,18 @@ ///////////////////////////////////////////////////////////////////////////// // Name: statbmp.h // Purpose: wxStaticBitmap class -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: -// Created: ??/??/98 +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Copyright: (c) Stefan Csomor +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_STATBMP_H_ #define _WX_STATBMP_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "statbmp.h" #endif @@ -45,24 +45,23 @@ 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 { - // icons and bitmaps are really the same thing in wxMac - return (const wxIcon &)m_bitmap; + // 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_bitmap; - DECLARE_EVENT_TABLE() + DECLARE_EVENT_TABLE() }; #endif