signed/unsigned comparison warning fixed

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

diff --git a/src/msw/metafile.cpp b/src/msw/metafile.cpp
index eb13f6384f5487a3ebdd817731052610bfe6e82a..4f46aed04a8f4182a4cf3e087f0b6ba4146b4bcf 100644 (file)
--- a/src/msw/metafile.cpp
+++ b/src/msw/metafile.cpp
@@ -5,8 +5,8 @@
 // Modified by: VZ 07.01.00: implemented wxMetaFileDataObject
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -104,6 +104,9 @@ wxMetafile::~wxMetafile()
 
 bool wxMetafile::SetClipboard(int width, int height)
 {
+#if !wxUSE_CLIPBOARD
+    return FALSE;
+#else
     if (!m_refData)
         return FALSE;
 
@@ -119,6 +122,7 @@ bool wxMetafile::SetClipboard(int width, int height)
         wxCloseClipboard();
 
     return success;
+#endif
 }
 
 bool wxMetafile::Play(wxDC *dc)
@@ -304,8 +308,6 @@ void wxMetafileDC::SetMapMode(int mode)
                 break;
             }
     }
-    m_windowExtX = 100;
-    m_windowExtY = 100;
 }
 
 // ----------------------------------------------------------------------------
@@ -375,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 = fopen(filename.fn_str(), "rb");
+    FILE *fd = wxFopen(filename.fn_str(), "rb");
     if (!fd) return FALSE;
 
     wxChar tempFileBuf[256];
     wxGetTempFileName(wxT("mf"), tempFileBuf);
-    FILE *fHandle = fopen(wxConvFile.cWX2MB(tempFileBuf), "wb");
+    FILE *fHandle = wxFopen(wxConvFile.cWX2MB(tempFileBuf), "wb");
     if (!fHandle)
         return FALSE;
     fwrite((void *)&header, sizeof(unsigned char), sizeof(mfPLACEABLEHEADER), fHandle);
@@ -490,8 +492,8 @@ bool wxMetafileDataObject::SetData(size_t WXUNUSED(len), const void *buf)
     wxMetafile mf;
     mf.SetWindowsMappingMode(mfpict->mm);
 
-    int w = mfpict->xExt,
-        h = mfpict->yExt;
+    LONG w = mfpict->xExt,
+         h = mfpict->yExt;
     if ( mfpict->mm == MM_ANISOTROPIC )
     {
         // in this case xExt and yExt contain suggested size in HIMETRIC units