X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f8855e47254a28f5141524b3aaaac03c2944e997..137c8bde085d6d5b7c459902d2ea1a198ab48765:/src/mgl/bitmap.cpp diff --git a/src/mgl/bitmap.cpp b/src/mgl/bitmap.cpp index 3fdab5fe9c..5eb34733e8 100644 --- a/src/mgl/bitmap.cpp +++ b/src/mgl/bitmap.cpp @@ -14,13 +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" +#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" @@ -205,7 +209,7 @@ bool wxBitmap::Create(int width, int height, int depth) { UnRef(); - wxCHECK_MSG( (width > 0) && (height > 0), false, wxT("invalid bitmap size") ) + wxCHECK_MSG( (width > 0) && (height > 0), false, wxT("invalid bitmap size") ); pixel_format_t pf_dummy; pixel_format_t *pf; @@ -237,7 +241,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; } @@ -267,11 +271,11 @@ bool wxBitmap::Create(int width, int height, int depth) bool wxBitmap::CreateFromXpm(const char **bits) { - wxCHECK_MSG( bits != NULL, false, wxT("invalid bitmap data") ) + wxCHECK_MSG( bits != NULL, false, wxT("invalid bitmap data") ); wxXPMDecoder decoder; wxImage img = decoder.ReadData(bits); - wxCHECK_MSG( img.Ok(), false, wxT("invalid bitmap data") ) + wxCHECK_MSG( img.Ok(), false, wxT("invalid bitmap data") ); *this = wxBitmap(img); @@ -282,7 +286,7 @@ wxBitmap::wxBitmap(const wxImage& image, int depth) { long width, height; - wxCHECK_RET( image.Ok(), wxT("invalid image") ) + wxCHECK_RET( image.Ok(), wxT("invalid image") ); width = image.GetWidth(); height = image.GetHeight();