X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fc7a2a602b4bd9308be21bc07e40a680f483438e..07170120ee06625fead8c72ad537bf41fa3ed8a9:/include/wx/statbmp.h diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h index 3c81aa4781..7eb8a31b73 100644 --- a/include/wx/statbmp.h +++ b/include/wx/statbmp.h @@ -12,7 +12,7 @@ #ifndef _WX_STATBMP_H_BASE_ #define _WX_STATBMP_H_BASE_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "statbmpbase.h" #endif @@ -34,17 +34,17 @@ class WXDLLEXPORT wxStaticBitmapBase : public wxControl public: wxStaticBitmapBase() { } virtual ~wxStaticBitmapBase(); - + // our interface virtual void SetIcon(const wxIcon& icon) = 0; virtual void SetBitmap(const wxBitmap& bitmap) = 0; virtual wxBitmap GetBitmap() const = 0; // overriden base class virtuals - virtual bool AcceptsFocus() const { return FALSE; } + virtual bool AcceptsFocus() const { return false; } protected: - virtual wxSize DoGetBestClientSize() const; + virtual wxSize DoGetBestSize() const; DECLARE_NO_COPY_CLASS(wxStaticBitmapBase) };