X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/637b7e4f3a0fd1c6bdfc21d28e37bcf760e3b364..507abc7b3af8d73e7caf05261d1f40b51775ae7a:/src/x11/bitmap.cpp diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp index bf22d84b9d..7236c231b7 100644 --- a/src/x11/bitmap.cpp +++ b/src/x11/bitmap.cpp @@ -13,12 +13,14 @@ #include "wx/wxprec.h" #include "wx/bitmap.h" -#include "wx/icon.h" -#include "wx/log.h" -#include "wx/image.h" -#include "wx/app.h" -#if wxUSE_NANOX -#include "wx/dcmemory.h" + +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/app.h" + #include "wx/dcmemory.h" + #include "wx/icon.h" + #include "wx/math.h" + #include "wx/image.h" #endif #include "wx/x11/private.h" @@ -40,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 @@ -327,7 +328,7 @@ bool wxBitmap::Create( int width, int height, int depth ) if (depth == -1) depth = bpp; wxCHECK_MSG( (depth == bpp) || - (depth == 1), false, wxT("invalid bitmap depth") ) + (depth == 1), false, wxT("invalid bitmap depth") ); M_BMPDATA->m_mask = (wxMask *) NULL; M_BMPDATA->m_width = width;