X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7ba4fbebbc40bdf9c140f4c9ba9977fbf810527d..a811affe70feeb727bf7fbd2748a48ded6ec3b9b:/src/msw/enhmeta.cpp diff --git a/src/msw/enhmeta.cpp b/src/msw/enhmeta.cpp index f7ab6178fa..b931e44bdf 100644 --- a/src/msw/enhmeta.cpp +++ b/src/msw/enhmeta.cpp @@ -183,8 +183,8 @@ wxEnhMetaFileDC::wxEnhMetaFileDC(const wxString& filename, const wxString& description) { ScreenHDC hdcRef; - - RECT rect, *pRect; + RECT rect; + RECT *pRect; if ( width && height ) { rect.top = @@ -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;