X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6632225c98f1a178c599a0238bb5c79d4d960f2b..a8c5e1a9d1f56190e2d87aadc40a75589585af1f:/src/common/image.cpp diff --git a/src/common/image.cpp b/src/common/image.cpp index d7ef644f5f..545afb1301 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -20,17 +20,16 @@ #ifndef WX_PRECOMP #include "wx/log.h" - #include "wx/app.h" #include "wx/hash.h" #include "wx/utils.h" - #include "wx/bitmap.h" #include "wx/math.h" + #include "wx/module.h" + #include "wx/palette.h" + #include "wx/intl.h" #endif #include "wx/filefn.h" #include "wx/wfstream.h" -#include "wx/intl.h" -#include "wx/module.h" #if wxUSE_XPM #include "wx/xpmdecod.h" @@ -1673,7 +1672,7 @@ int wxImage::GetImageCount( wxInputStream &stream, long type ) if ( !handler ) { - wxLogWarning(_("No image handler for type %d defined."), type); + wxLogWarning(_("No image handler for type %ld defined."), type); return false; } @@ -1683,7 +1682,7 @@ int wxImage::GetImageCount( wxInputStream &stream, long type ) } else { - wxLogError(_("Image file is not of type %d."), type); + wxLogError(_("Image file is not of type %ld."), type); return 0; } } @@ -1716,14 +1715,14 @@ bool wxImage::LoadFile( wxInputStream& stream, long type, int index ) if (handler == 0) { - wxLogWarning( _("No image handler for type %d defined."), type ); + wxLogWarning( _("No image handler for type %ld defined."), type ); return false; } if (stream.IsSeekable() && !handler->CanRead(stream)) { - wxLogError(_("Image file is not of type %d."), type); + wxLogError(_("Image file is not of type %ld."), type); return false; } else