Some improvements to accessibility behaviour

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

diff --git a/src/msw/enhmeta.cpp b/src/msw/enhmeta.cpp
index b931e44bdf4d6dde2b18ac91cb3bbae9894543a0..6061f3dedab19f42662b0176391af2be9b1d4cdd 100644 (file)
--- a/src/msw/enhmeta.cpp
+++ b/src/msw/enhmeta.cpp
@@ -193,14 +193,7 @@ wxEnhMetaFileDC::wxEnhMetaFileDC(const wxString& filename,
         rect.bottom = height;
 
         // CreateEnhMetaFile() wants them in HIMETRIC
         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);
         PixelToHIMETRIC(&rect.right, &rect.bottom);

-#endif

         
         pRect = ▭
     }
         
         pRect = ▭
     }


@@ -301,10 +294,6 @@ bool wxEnhMetaFileDataObject::GetDataHere(const wxDataFormat& format, void *buf)
     }
     else
     {
     }
     else
     {

-#ifdef __WXWINE__
-        wxFAIL_MSG( _T("unsupported format") );
-        return FALSE;
-#else

         wxASSERT_MSG( format == wxDF_METAFILE, _T("unsupported format") );
 
         // convert to WMF
         wxASSERT_MSG( format == wxDF_METAFILE, _T("unsupported format") );
 
         // convert to WMF


@@ -346,7 +335,6 @@ bool wxEnhMetaFileDataObject::GetDataHere(const wxDataFormat& format, void *buf)
         mfpict->yExt = sizeMF.y;
 
         PixelToHIMETRIC(&mfpict->xExt, &mfpict->yExt);
         mfpict->yExt = sizeMF.y;
 
         PixelToHIMETRIC(&mfpict->xExt, &mfpict->yExt);

-#endif

     }
 
     return TRUE;
     }
 
     return TRUE;