X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/637b7e4f3a0fd1c6bdfc21d28e37bcf760e3b364..1fc1e6af05bbadac95a0c14327afd49e0eb8ade6:/src/mgl/bitmap.cpp diff --git a/src/mgl/bitmap.cpp b/src/mgl/bitmap.cpp index 8c5bcd2a80..85cfbe0fee 100644 --- a/src/mgl/bitmap.cpp +++ b/src/mgl/bitmap.cpp @@ -14,14 +14,17 @@ #endif #include "wx/bitmap.h" -#include "wx/icon.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/utils.h" + #include "wx/dcmemory.h" + #include "wx/icon.h" + #include "wx/image.h" +#endif + #include "wx/filefn.h" -#include "wx/image.h" -#include "wx/dcmemory.h" -#include "wx/utils.h" -#include "wx/log.h" -#include "wx/intl.h" -#include "wx/image.h" #include "wx/xpmdecod.h" #include "wx/mgl/private.h" @@ -152,7 +155,7 @@ class wxBitmapRefData: public wxObjectRefData { public: wxBitmapRefData(); - ~wxBitmapRefData(); + virtual ~wxBitmapRefData(); int m_width; int m_height; @@ -237,7 +240,7 @@ bool wxBitmap::Create(int width, int height, int depth) pf = &gs_pixel_format_32; break; default: - wxASSERT_MSG( 0, wxT("invalid bitmap depth") ); + wxFAIL_MSG(wxT("invalid bitmap depth")); return false; }