X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af49c4b8a2d3553e733e71c7dd3911881f4c1a2a..5bc97d1b81910a82e249f6227798b42089149f94:/include/wx/statbmp.h?ds=sidebyside diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h index d007045208..02f5c7ef05 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 @@ -42,6 +45,8 @@ class WXDLLEXPORT wxStaticBitmapBase : public wxControl protected: virtual wxSize DoGetBestClientSize() const; + + DECLARE_NO_COPY_CLASS(wxStaticBitmapBase) }; #if defined(__WXUNIVERSAL__) @@ -54,10 +59,10 @@ protected: #include "wx/gtk/statbmp.h" #elif defined(__WXMAC__) #include "wx/mac/statbmp.h" +#elif defined(__WXCOCOA__) + #include "wx/cocoa/statbmp.h" #elif defined(__WXPM__) #include "wx/os2/statbmp.h" -#elif defined(__WXSTUBS__) - #include "wx/stubs/statbmp.h" #endif #endif // wxUSE_STATBMP