X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e711d5c093dcc758e3f1670caf845612ea9fa92..cf6ae2907c365869b10b61cbe3bde2768facd4d8:/include/wx/statbmp.h diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h index 93f26e7924..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 __DARWIN__ - ~wxStaticBitmapBase() { } -#endif + virtual ~wxStaticBitmapBase(); // our interface virtual void SetIcon(const wxIcon& icon) = 0; @@ -56,10 +54,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