X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a83f860948059b0273b5cc6d9e43fadad3ebfca..404b319a85dadd7decf7a5a5331020520031a41c:/src/msw/metafile.cpp

diff --git a/src/msw/metafile.cpp b/src/msw/metafile.cpp
index e20f24a5b4..3cbb79fb63 100644
--- a/src/msw/metafile.cpp
+++ b/src/msw/metafile.cpp
@@ -177,13 +177,13 @@ wxMetafileDCImpl::wxMetafileDCImpl(wxDC *owner, const wxString& file)
     m_maxY = -10000;
     //  m_title = NULL;
 
-    if (!file.IsNull() && wxFileExists(file))
+    if ( wxFileExists(file) )
         wxRemoveFile(file);
 
-    if (!file.IsNull() && (file != wxEmptyString))
-        m_hDC = (WXHDC) CreateMetaFile(file);
-    else
+    if ( file.empty() )
         m_hDC = (WXHDC) CreateMetaFile(NULL);
+    else
+        m_hDC = (WXHDC) CreateMetaFile(file);
 
     m_ok = (m_hDC != (WXHDC) 0) ;
 
@@ -205,7 +205,7 @@ wxMetafileDCImpl::wxMetafileDCImpl(wxDC *owner, const wxString& file,
     m_maxY = -10000;
     if ( !file.empty() && wxFileExists(file) )
         wxRemoveFile(file);
-    m_hDC = (WXHDC) CreateMetaFile(file.empty() ? NULL : file.wx_str());
+    m_hDC = (WXHDC) CreateMetaFile(file.empty() ? NULL : wxMSW_CONV_LPCTSTR(file));
 
     m_ok = true;
 
@@ -400,7 +400,7 @@ bool wxMakeMetafilePlaceable(const wxString& filename, int x1, int y1, int x2, i
     FILE *fHandle = wxFopen(tempFileBuf.fn_str(), wxT("wb"));
     if (!fHandle)
         return false;
-    fwrite((void *)&header, sizeof(unsigned char), sizeof(mfPLACEABLEHEADER), fHandle);
+    fwrite((void *)&header, 1, sizeof(mfPLACEABLEHEADER), fHandle);
 
     // Calculate origin and extent
     int originX = x1;
@@ -410,14 +410,14 @@ bool wxMakeMetafilePlaceable(const wxString& filename, int x1, int y1, int x2, i
 
     // Read metafile header and write
     METAHEADER metaHeader;
-    fread((void *)&metaHeader, sizeof(unsigned char), sizeof(metaHeader), fd);
+    fread((void *)&metaHeader, 1, sizeof(metaHeader), fd);
 
     if (useOriginAndExtent)
         metaHeader.mtSize += 15;
     else
         metaHeader.mtSize += 5;
 
-    fwrite((void *)&metaHeader, sizeof(unsigned char), sizeof(metaHeader), fHandle);
+    fwrite((void *)&metaHeader, 1, sizeof(metaHeader), fHandle);
 
     // Write SetMapMode, SetWindowOrigin and SetWindowExt records
     char modeBuffer[8];
@@ -442,12 +442,12 @@ bool wxMakeMetafilePlaceable(const wxString& filename, int x1, int y1, int x2, i
     extentRecord->rdParm[0] = extentY;
     extentRecord->rdParm[1] = extentX;
 
-    fwrite((void *)modeBuffer, sizeof(char), 8, fHandle);
+    fwrite((void *)modeBuffer, 1, 8, fHandle);
 
     if (useOriginAndExtent)
     {
-        fwrite((void *)originBuffer, sizeof(char), 10, fHandle);
-        fwrite((void *)extentBuffer, sizeof(char), 10, fHandle);
+        fwrite((void *)originBuffer, 1, 10, fHandle);
+        fwrite((void *)extentBuffer, 1, 10, fHandle);
     }
 
     int ch = -2;