X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..7230716d7a2623cb78fa84f8ed66f20aa388a9b4:/src/msw/metafile.cpp diff --git a/src/msw/metafile.cpp b/src/msw/metafile.cpp index 57a7baf9db..f0e7314343 100644 --- a/src/msw/metafile.cpp +++ b/src/msw/metafile.cpp @@ -222,7 +222,7 @@ wxMetafileDC::~wxMetafileDC() } void wxMetafileDC::GetTextExtent(const wxString& string, long *x, long *y, - long *descent, long *externalLeading, wxFont *theFont, bool use16bit) const + long *descent, long *externalLeading, wxFont *theFont, bool WXUNUSED(use16bit)) const { wxFont *fontToUse = theFont; if (!fontToUse) @@ -377,12 +377,12 @@ bool wxMakeMetafilePlaceable(const wxString& filename, int x1, int y1, int x2, i p < (WORD *)&pMFHead ->checksum; ++p) pMFHead ->checksum ^= *p; - FILE *fd = wxFopen(filename.fn_str(), "rb"); + FILE *fd = wxFopen(filename.fn_str(), _T("rb")); if (!fd) return FALSE; wxChar tempFileBuf[256]; wxGetTempFileName(wxT("mf"), tempFileBuf); - FILE *fHandle = wxFopen(wxConvFile.cWX2MB(tempFileBuf), "wb"); + FILE *fHandle = wxFopen(wxFNCONV(tempFileBuf), _T("wb")); if (!fHandle) return FALSE; fwrite((void *)&header, sizeof(unsigned char), sizeof(mfPLACEABLEHEADER), fHandle);