X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a95e38c03464c854af73b960b17db12624bd8f8c..fcf90ee1b10d41b4ddfbfa537481a9c64e30348f:/src/msw/enhmeta.cpp

diff --git a/src/msw/enhmeta.cpp b/src/msw/enhmeta.cpp
index 5ce1e70d94..73c04b84db 100644
--- 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
 
@@ -170,6 +170,7 @@ bool wxEnhMetaFile::SetClipboard(int WXUNUSED(width), int WXUNUSED(height))
     return wxTheClipboard->AddData(new wxEnhMetaFileDataObject(*this));
 #else // !wxUSE_DRAG_AND_DROP
     wxFAIL_MSG(_T("not implemented"));
+    return FALSE;
 #endif // wxUSE_DRAG_AND_DROP/!wxUSE_DRAG_AND_DROP
 }
 
@@ -182,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,7 +194,7 @@ wxEnhMetaFileDC::wxEnhMetaFileDC(const wxString& filename,
 
         // CreateEnhMetaFile() wants them in HIMETRIC
         PixelToHIMETRIC(&rect.right, &rect.bottom);
-
+        
         pRect = &rect;
     }
     else
@@ -233,12 +234,12 @@ wxEnhMetaFileDC::~wxEnhMetaFileDC()
     m_hDC = 0;
 }
 
+#if wxUSE_DRAG_AND_DROP
+
 // ----------------------------------------------------------------------------
 // wxEnhMetaFileDataObject
 // ----------------------------------------------------------------------------
 
-#if wxUSE_DRAG_AND_DROP
-
 wxDataFormat
 wxEnhMetaFileDataObject::GetPreferredFormat(Direction WXUNUSED(dir)) const
 {
@@ -390,6 +391,47 @@ bool wxEnhMetaFileDataObject::SetData(const wxDataFormat& format,
 
     return TRUE;
 }
+
+// ----------------------------------------------------------------------------
+// wxEnhMetaFileSimpleDataObject
+// ----------------------------------------------------------------------------
+
+size_t wxEnhMetaFileSimpleDataObject::GetDataSize() const
+{
+    // we pass data by handle and not HGLOBAL
+    return 0u;
+}
+
+bool wxEnhMetaFileSimpleDataObject::GetDataHere(void *buf) const
+{
+    wxCHECK_MSG( m_metafile.Ok(), FALSE, _T("copying invalid enh metafile") );
+
+    HENHMETAFILE hEMF = (HENHMETAFILE)m_metafile.GetHENHMETAFILE();
+
+    HENHMETAFILE hEMFCopy = ::CopyEnhMetaFile(hEMF, NULL);
+    if ( !hEMFCopy )
+    {
+        wxLogLastError(_T("CopyEnhMetaFile"));
+
+        return FALSE;
+    }
+
+    *(HENHMETAFILE *)buf = hEMFCopy;
+    return TRUE;
+}
+
+bool wxEnhMetaFileSimpleDataObject::SetData(size_t WXUNUSED(len),
+                                            const void *buf)
+{
+    HENHMETAFILE hEMF = *(HENHMETAFILE *)buf;
+
+    wxCHECK_MSG( hEMF, FALSE, _T("pasting invalid enh metafile") );
+    m_metafile.SetHENHMETAFILE((WXHANDLE)hEMF);
+
+    return TRUE;
+}
+
+
 #endif // wxUSE_DRAG_AND_DROP
 
 #endif // wxUSE_ENH_METAFILE