X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8628b7d4139d1fa2ab60b254a1a346008d4a9123..1ae82ba9f23ee688bc4db2cd449eca5bf97cfdf0:/src/gtk1/bitmap.cpp diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp index 8237eaa338..bd4abefa09 100644 --- a/src/gtk1/bitmap.cpp +++ b/src/gtk1/bitmap.cpp @@ -10,15 +10,18 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/defs.h" - #include "wx/bitmap.h" -#include "wx/palette.h" -#include "wx/icon.h" + +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/dcmemory.h" + #include "wx/palette.h" + #include "wx/icon.h" + #include "wx/math.h" +#endif // WX_PRECOMP + #include "wx/filefn.h" #include "wx/image.h" -#include "wx/dcmemory.h" -#include "wx/app.h" #include #include @@ -26,8 +29,6 @@ #include -#include "wx/math.h" - extern void gdk_wx_draw_bitmap (GdkDrawable *drawable, GdkGC *gc, @@ -291,7 +292,7 @@ bool wxBitmap::Create( int width, int height, int depth ) depth = visual->depth; wxCHECK_MSG( (depth == visual->depth) || (depth == 1) || (depth == 32), false, - wxT("invalid bitmap depth") ) + wxT("invalid bitmap depth") ); m_refData = new wxBitmapRefData(); M_BMPDATA->m_mask = (wxMask *) NULL; @@ -315,7 +316,7 @@ bool wxBitmap::CreateFromXpm( const char **bits ) { UnRef(); - wxCHECK_MSG( bits != NULL, false, wxT("invalid bitmap data") ) + wxCHECK_MSG( bits != NULL, false, wxT("invalid bitmap data") ); GdkVisual *visual = wxTheApp->GetGdkVisual(); @@ -527,8 +528,8 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth) { UnRef(); - wxCHECK_MSG( image.Ok(), false, wxT("invalid image") ) - wxCHECK_MSG( depth == -1 || depth == 1, false, wxT("invalid bitmap depth") ) + wxCHECK_MSG( image.Ok(), false, wxT("invalid image") ); + wxCHECK_MSG( depth == -1 || depth == 1, false, wxT("invalid bitmap depth") ); if (image.GetWidth() <= 0 || image.GetHeight() <= 0) return false;