Compilation fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/metafile.cpp b/src/msw/metafile.cpp
index 681c8d3a5637893d11037ac7742a4f382ac69933..f0e731434386f91f2de0a68b441bdc618f89e5c0 100644 (file)
--- 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,
 }
 
 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)
 {
     wxFont *fontToUse = theFont;
     if (!fontToUse)


@@ -382,7 +382,7 @@ bool wxMakeMetafilePlaceable(const wxString& filename, int x1, int y1, int x2, i
 
     wxChar tempFileBuf[256];
     wxGetTempFileName(wxT("mf"), tempFileBuf);
 
     wxChar tempFileBuf[256];
     wxGetTempFileName(wxT("mf"), tempFileBuf);

-    FILE *fHandle = wxFopen(wxFNCONV(wxConvFile), _T("wb"));
+    FILE *fHandle = wxFopen(wxFNCONV(tempFileBuf), _T("wb"));

     if (!fHandle)
         return FALSE;
     fwrite((void *)&header, sizeof(unsigned char), sizeof(mfPLACEABLEHEADER), fHandle);
     if (!fHandle)
         return FALSE;
     fwrite((void *)&header, sizeof(unsigned char), sizeof(mfPLACEABLEHEADER), fHandle);