X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/584bede0618774ad7f62476c9adddeb9776fb737..61b50a43aaaf29fe9c2f848958adafc496439123:/include/wx/mac/bitmap.h diff --git a/include/wx/mac/bitmap.h b/include/wx/mac/bitmap.h index 9308aca1c3..7cc0160c27 100644 --- a/include/wx/mac/bitmap.h +++ b/include/wx/mac/bitmap.h @@ -13,11 +13,9 @@ #define _WX_BITMAP_H_ #ifdef __GNUG__ -#pragma interface "bitmap.h" + #pragma interface "bitmap.h" #endif -#include "wx/gdiobj.h" -#include "wx/gdicmn.h" #include "wx/palette.h" // Bitmap @@ -103,8 +101,8 @@ class WXDLLEXPORT wxBitmapHandler: public wxBitmapHandlerBase DECLARE_DYNAMIC_CLASS(wxBitmapHandler) public: wxBitmapHandler() { m_name = ""; m_extension = ""; m_type = 0; }; -#ifdef __WXMAC_X__ - virtual ~wxBitmapHandler() {} // Added min for Mac X +#ifdef __DARWIN__ + virtual ~wxBitmapHandler() { } #endif virtual bool Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth = 1); @@ -209,7 +207,6 @@ public: static void InitStandardHandlers(); static void CleanUpHandlers(); protected: - static wxList sm_handlers; // TODO: Implementation public: