undid WS_EX_CONTROLPARENT change -- I recall now why we can't use it

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

diff --git a/src/msw/metafile.cpp b/src/msw/metafile.cpp
index eb13f6384f5487a3ebdd817731052610bfe6e82a..ce2568c2c2ec34e8c662f4bc0fb3c3f654351cf9 100644 (file)
--- a/src/msw/metafile.cpp
+++ b/src/msw/metafile.cpp
@@ -104,6 +104,9 @@ wxMetafile::~wxMetafile()
 
 bool wxMetafile::SetClipboard(int width, int height)
 {
 
 bool wxMetafile::SetClipboard(int width, int height)
 {

+#if !wxUSE_CLIPBOARD
+    return FALSE;
+#else

     if (!m_refData)
         return FALSE;
 
     if (!m_refData)
         return FALSE;
 


@@ -119,6 +122,7 @@ bool wxMetafile::SetClipboard(int width, int height)
         wxCloseClipboard();
 
     return success;
         wxCloseClipboard();
 
     return success;

+#endif

 }
 
 bool wxMetafile::Play(wxDC *dc)
 }
 
 bool wxMetafile::Play(wxDC *dc)


@@ -375,12 +379,12 @@ 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.fn_str(), "rb");
+    FILE *fd = wxFopen(filename.fn_str(), "rb");

     if (!fd) return FALSE;
 
     wxChar tempFileBuf[256];
     wxGetTempFileName(wxT("mf"), tempFileBuf);
     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);
     if (!fHandle)
         return FALSE;
     fwrite((void *)&header, sizeof(unsigned char), sizeof(mfPLACEABLEHEADER), fHandle);


@@ -490,8 +494,8 @@ bool wxMetafileDataObject::SetData(size_t WXUNUSED(len), const void *buf)
     wxMetafile mf;
     mf.SetWindowsMappingMode(mfpict->mm);
 
     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
     if ( mfpict->mm == MM_ANISOTROPIC )
     {
         // in this case xExt and yExt contain suggested size in HIMETRIC units