Use GetBackgroundColour in the default OnEraseBackground so it can use

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

diff --git a/src/msw/enhmeta.cpp b/src/msw/enhmeta.cpp
index b931e44bdf4d6dde2b18ac91cb3bbae9894543a0..73c04b84dbb8952556b26213f9afc97357067b69 100644 (file)
--- a/src/msw/enhmeta.cpp
+++ b/src/msw/enhmeta.cpp
@@ -6,7 +6,7 @@
 // Created:     13.01.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "enhmeta.h"
 #endif
 
@@ -193,14 +193,7 @@ 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 = &rect;
     }
@@ -301,10 +294,6 @@ 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
@@ -346,7 +335,6 @@ bool wxEnhMetaFileDataObject::GetDataHere(const wxDataFormat& format, void *buf)
         mfpict->yExt = sizeMF.y;
 
         PixelToHIMETRIC(&mfpict->xExt, &mfpict->yExt);
-#endif
     }
 
     return TRUE;
@@ -443,6 +431,7 @@ bool wxEnhMetaFileSimpleDataObject::SetData(size_t WXUNUSED(len),
     return TRUE;
 }
 
+
 #endif // wxUSE_DRAG_AND_DROP
 
 #endif // wxUSE_ENH_METAFILE