X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b698c8e9bfbcf149f8ac375ea5b5ff6af9cba86a..c26dba42b75b2c19df5834417ffbe330bc375b20:/include/wx/statbmp.h diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h index f741d8b4d0..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_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "statbmpbase.h" #endif +#include "wx/defs.h" + #if wxUSE_STATBMP #include "wx/control.h" @@ -29,10 +31,9 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr; // a control showing an icon or a bitmap class WXDLLEXPORT wxStaticBitmapBase : public wxControl { - public: -#ifdef __WXMAC_X__ - ~wxStaticBitmapBase() { } -#endif +public: + wxStaticBitmapBase() { } + virtual ~wxStaticBitmapBase(); // our interface virtual void SetIcon(const wxIcon& icon) = 0; @@ -44,6 +45,8 @@ class WXDLLEXPORT wxStaticBitmapBase : public wxControl protected: virtual wxSize DoGetBestClientSize() const; + + DECLARE_NO_COPY_CLASS(wxStaticBitmapBase) }; #if defined(__WXUNIVERSAL__) @@ -54,14 +57,12 @@ protected: #include "wx/motif/statbmp.h" #elif defined(__WXGTK__) #include "wx/gtk/statbmp.h" -#elif defined(__WXQT__) - #include "wx/qt/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