Regenerated from tmake after editing filelist.txt to add gridg.h

[wxWidgets.git] / src / msw / metafile.cpp

diff --git a/src/msw/metafile.cpp b/src/msw/metafile.cpp
index 0d4a30f506b979a778f63ca25fba0e1a843ffd34..7f99f93c635941562952265b6d8d00a13e460d0e 100644 (file)
--- a/src/msw/metafile.cpp
+++ b/src/msw/metafile.cpp
@@ -72,7 +72,7 @@ wxMetafile::wxMetafile(const wxString& file)
 
     M_METAFILEDATA->m_windowsMappingMode = wxMM_ANISOTROPIC;
     M_METAFILEDATA->m_metafile = 0;
 
     M_METAFILEDATA->m_windowsMappingMode = wxMM_ANISOTROPIC;
     M_METAFILEDATA->m_metafile = 0;

-    if (!file.IsNull() && (file.Cmp(_T("")) == 0))
+    if (!file.IsNull() && (file.Cmp(wxT("")) == 0))

         M_METAFILEDATA->m_metafile = (WXHANDLE) GetMetaFile(file);
 }
 
         M_METAFILEDATA->m_metafile = (WXHANDLE) GetMetaFile(file);
 }
 


@@ -146,7 +146,7 @@ wxMetafileDC::wxMetafileDC(const wxString& file)
   if (!file.IsNull() && wxFileExists(file))
     wxRemoveFile(file);
 
   if (!file.IsNull() && wxFileExists(file))
     wxRemoveFile(file);
 

-  if (!file.IsNull() && (file != _T("")))
+  if (!file.IsNull() && (file != wxT("")))

     m_hDC = (WXHDC) CreateMetaFile(file);
   else
     m_hDC = (WXHDC) CreateMetaFile(NULL);
     m_hDC = (WXHDC) CreateMetaFile(file);
   else
     m_hDC = (WXHDC) CreateMetaFile(NULL);


@@ -167,7 +167,7 @@ wxMetafileDC::wxMetafileDC(const wxString& file, int xext, int yext, int xorg, i
   m_minY = 10000;
   m_maxX = -10000;
   m_maxY = -10000;
   m_minY = 10000;
   m_maxX = -10000;
   m_maxY = -10000;

-  if (file != _T("") && wxFileExists(file)) wxRemoveFile(file);
+  if (file != wxT("") && wxFileExists(file)) wxRemoveFile(file);

   m_hDC = (WXHDC) CreateMetaFile(file);
 
   m_ok = TRUE;
   m_hDC = (WXHDC) CreateMetaFile(file);
 
   m_ok = TRUE;


@@ -340,11 +340,11 @@ bool wxMakeMetafilePlaceable(const wxString& filename, int x1, int y1, int x2, i
        p < (WORD *)&pMFHead ->checksum; ++p)
        pMFHead ->checksum ^= *p;
 
        p < (WORD *)&pMFHead ->checksum; ++p)
        pMFHead ->checksum ^= *p;
 

-  FILE *fd = fopen(filename.mb_str(wxConvFile), "rb");
+  FILE *fd = fopen(filename.fn_str(), "rb");

   if (!fd) return FALSE;
   
   wxChar tempFileBuf[256];
   if (!fd) return FALSE;
   
   wxChar tempFileBuf[256];

-  wxGetTempFileName(_T("mf"), tempFileBuf);
+  wxGetTempFileName(wxT("mf"), tempFileBuf);

   FILE *fHandle = fopen(wxConvFile.cWX2MB(tempFileBuf), "wb");
   if (!fHandle)
     return FALSE;
   FILE *fHandle = fopen(wxConvFile.cWX2MB(tempFileBuf), "wb");
   if (!fHandle)
     return FALSE;