X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/670f9935630beb2123a5ca62894ae92a3f0efa4f..2cbd98abc221cab46a54582c37a77f338b44f6b7:/src/x11/bitmap.cpp diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp index ae4c2e3f12..920910df87 100644 --- a/src/x11/bitmap.cpp +++ b/src/x11/bitmap.cpp @@ -17,12 +17,10 @@ #ifndef WX_PRECOMP #include "wx/log.h" #include "wx/app.h" -#endif - -#include "wx/icon.h" -#include "wx/image.h" -#if wxUSE_NANOX -#include "wx/dcmemory.h" + #include "wx/dcmemory.h" + #include "wx/icon.h" + #include "wx/math.h" + #include "wx/image.h" #endif #include "wx/x11/private.h" @@ -44,7 +42,6 @@ bool wxGetImageFromDrawable(GR_DRAW_ID drawable, int srcX, int srcY, int width, #include "wx/wfstream.h" #endif #endif -#include "wx/math.h" //----------------------------------------------------------------------------- // wxMask @@ -234,7 +231,7 @@ class wxBitmapRefData: public wxObjectRefData { public: wxBitmapRefData(); - ~wxBitmapRefData(); + virtual ~wxBitmapRefData(); WXPixmap m_pixmap; WXPixmap m_bitmap;