X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b698c8e9bfbcf149f8ac375ea5b5ff6af9cba86a..9bb1b0554014ee7f1e482d64c899ecef0391e74b:/include/wx/statbmp.h diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h index f741d8b4d0..e78a347b7e 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_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "statbmpbase.h" #endif @@ -30,9 +30,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr; class WXDLLEXPORT wxStaticBitmapBase : public wxControl { public: -#ifdef __WXMAC_X__ - ~wxStaticBitmapBase() { } -#endif + virtual ~wxStaticBitmapBase(); // our interface virtual void SetIcon(const wxIcon& icon) = 0; @@ -54,14 +52,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