X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e64df9bcc331d49d05a6dc7729ee08071e4c6408..119727ad9e58e42326764a259a5b88267bb43528:/include/wx/statbmp.h?ds=sidebyside diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h index e78a347b7e..49bcf7fb93 100644 --- a/include/wx/statbmp.h +++ b/include/wx/statbmp.h @@ -12,10 +12,12 @@ #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 +#include "wx/defs.h" + #if wxUSE_STATBMP #include "wx/control.h" @@ -29,7 +31,8 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr; // a control showing an icon or a bitmap class WXDLLEXPORT wxStaticBitmapBase : public wxControl { - public: +public: + wxStaticBitmapBase() { } virtual ~wxStaticBitmapBase(); // our interface @@ -41,7 +44,9 @@ class WXDLLEXPORT wxStaticBitmapBase : public wxControl virtual bool AcceptsFocus() const { return FALSE; } protected: - virtual wxSize DoGetBestClientSize() const; + virtual wxSize DoGetBestSize() const; + + DECLARE_NO_COPY_CLASS(wxStaticBitmapBase) }; #if defined(__WXUNIVERSAL__)