From e175603394f5ea4a9748ccd259e4ec3ab8c1978e Mon Sep 17 00:00:00 2001 From: Mattia Barbon Date: Wed, 22 Oct 2003 20:30:59 +0000 Subject: [PATCH] Fixed condition not to be always false. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@24262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/metafile.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/msw/metafile.cpp b/src/msw/metafile.cpp index dad3bd1b42..15a5e6716f 100644 --- a/src/msw/metafile.cpp +++ b/src/msw/metafile.cpp @@ -94,7 +94,7 @@ wxMetafile::wxMetafile(const wxString& file) M_METAFILEDATA->m_windowsMappingMode = wxMM_ANISOTROPIC; M_METAFILEDATA->m_metafile = 0; - if (!file.IsNull() && (file.Cmp(wxT("")) == 0)) + if (!file.empty()) M_METAFILEDATA->m_metafile = (WXHANDLE) GetMetaFile(file); } @@ -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(), wxT("rb")); if (!fd) return FALSE; wxChar tempFileBuf[256]; wxGetTempFileName(wxT("mf"), tempFileBuf); - FILE *fHandle = wxFopen(wxConvFile.cWX2MB(tempFileBuf), "wb"); + FILE *fHandle = wxFopen(wxFNCONV(tempFileBuf), wxT("wb")); if (!fHandle) return FALSE; fwrite((void *)&header, sizeof(unsigned char), sizeof(mfPLACEABLEHEADER), fHandle);