X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/17d64ebc984b4792473934bddde37eef1708b1a9..5cf1cb1006d6b5762d96c07ee3892883607460c7:/contrib/src/ogl/mfutils.cpp?ds=inline diff --git a/contrib/src/ogl/mfutils.cpp b/contrib/src/ogl/mfutils.cpp index ce580697f5..9a103bedde 100644 --- a/contrib/src/ogl/mfutils.cpp +++ b/contrib/src/ogl/mfutils.cpp @@ -9,10 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "mfutils.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -21,11 +17,11 @@ #endif #ifndef WX_PRECOMP -#include +#include "wx/wx.h" #endif -#include -#include +#include "wx/metafile.h" +#include "wx/utils.h" #include "wx/ogl/ogl.h" @@ -560,14 +556,14 @@ bool wxXMetaFile::ReadFile(const wxChar *file) /* int lfEsc = */ getshort(handle); // 2 bytes /* int lfOrient = */ getshort(handle); // 2 bytes int lfWeight = getshort(handle); // 2 bytes - char lfItalic = getc(handle); // 1 byte - char lfUnderline = getc(handle); // 1 byte + char lfItalic = (char)getc(handle); // 1 byte + char lfUnderline = (char)getc(handle); // 1 byte /* char lfStrikeout = */ getc(handle); // 1 byte /* char lfCharSet = */ getc(handle); // 1 byte /* char lfOutPrecision = */ getc(handle); // 1 byte /* char lfClipPrecision = */ getc(handle); // 1 byte /* char lfQuality = */ getc(handle); // 1 byte - char lfPitchAndFamily = getc(handle); // 1 byte (18th) + char lfPitchAndFamily = (char)getc(handle); // 1 byte (18th) char lfFacename[32]; // Read the rest of the record, which is total record size // minus the number of bytes already read (18 record, 6 metarecord