X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/997176a34641a870b1f6c6102e30f64f86b4122a..31ad423e4fb556ec225a63b161154d3bf3445c1b:/include/wx/statbmp.h diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h index 7481a381af..49bcf7fb93 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 @@ -31,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 @@ -43,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__)