X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/637b7e4f3a0fd1c6bdfc21d28e37bcf760e3b364..2273efca477573381f9d64b856df64ddba3279f2:/src/x11/bitmap.cpp diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp index bf22d84b9d..91951610bb 100644 --- a/src/x11/bitmap.cpp +++ b/src/x11/bitmap.cpp @@ -13,14 +13,17 @@ #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" #endif +#include "wx/image.h" + #include "wx/x11/private.h" /* No point in using libXPM for NanoX */ @@ -40,7 +43,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 +329,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;