SourceForge patch #654210 to fix naming/numbering shared libs under OS X

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

diff --git a/src/msw/enhmeta.cpp b/src/msw/enhmeta.cpp
index ac757f7bd5ccd3563551279869eb2d964cc07a78..b931e44bdf4d6dde2b18ac91cb3bbae9894543a0 100644 (file)
--- a/src/msw/enhmeta.cpp
+++ b/src/msw/enhmeta.cpp
@@ -193,8 +193,15 @@ wxEnhMetaFileDC::wxEnhMetaFileDC(const wxString& filename,
         rect.bottom = height;
 
         // CreateEnhMetaFile() wants them in HIMETRIC
+#ifdef __WXWINE__
+        LONG r, b;
+        PixelToHIMETRIC(&r, &b);
+        rect.right = r;
+        rect.bottom = b;
+#else
         PixelToHIMETRIC(&rect.right, &rect.bottom);
-
+#endif
+        
         pRect = ▭
     }
     else
@@ -294,6 +301,10 @@ bool wxEnhMetaFileDataObject::GetDataHere(const wxDataFormat& format, void *buf)
     }
     else
     {
+#ifdef __WXWINE__
+        wxFAIL_MSG( _T("unsupported format") );
+        return FALSE;
+#else
         wxASSERT_MSG( format == wxDF_METAFILE, _T("unsupported format") );
 
         // convert to WMF
@@ -335,6 +346,7 @@ bool wxEnhMetaFileDataObject::GetDataHere(const wxDataFormat& format, void *buf)
         mfpict->yExt = sizeMF.y;
 
         PixelToHIMETRIC(&mfpict->xExt, &mfpict->yExt);
+#endif
     }
 
     return TRUE;