From 2dd726471f85f9bbe003f3b57827f980dd8bfd69 Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Mon, 1 May 2017 19:30:40 +0200
Subject: [PATCH] Build wxMetafileDataObject when wxUSE_DATAOBJ==1

wxMetafileDataObject is a specialization of wxDataObject and its
compilation should be controlled directly by wxUSE_DATAOBJ (like it's done
under wxOSX, see e.g. include/wx/osx/metafile.h), not by
wxUSE_DRAG_AND_DROP.
---
 include/wx/metafile.h     | 2 +-
 include/wx/msw/enhmeta.h  | 6 +++---
 include/wx/msw/metafile.h | 6 +++---
 src/msw/metafile.cpp      | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/wx/metafile.h b/include/wx/metafile.h
index e5e6dd03da..dce77931db 100644
--- a/include/wx/metafile.h
+++ b/include/wx/metafile.h
@@ -32,7 +32,7 @@
         #else // also map all metafile classes to enh metafile
             typedef wxEnhMetaFile wxMetafile;
             typedef wxEnhMetaFileDC wxMetafileDC;
-            #if wxUSE_DRAG_AND_DROP
+            #if wxUSE_DATAOBJ
                 typedef wxEnhMetaFileDataObject wxMetafileDataObject;
             #endif
 
diff --git a/include/wx/msw/enhmeta.h b/include/wx/msw/enhmeta.h
index 98d0320307..74c65ddb2c 100644
--- a/include/wx/msw/enhmeta.h
+++ b/include/wx/msw/enhmeta.h
@@ -14,7 +14,7 @@
 #include "wx/dc.h"
 #include "wx/gdiobj.h"
 
-#if wxUSE_DRAG_AND_DROP
+#if wxUSE_DATAOBJ
     #include "wx/dataobj.h"
 #endif
 
@@ -109,7 +109,7 @@ private:
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxEnhMetaFileDC);
 };
 
-#if wxUSE_DRAG_AND_DROP
+#if wxUSE_DATAOBJ
 
 // ----------------------------------------------------------------------------
 // wxEnhMetaFileDataObject is a specialization of wxDataObject for enh metafile
@@ -190,6 +190,6 @@ protected:
     wxDECLARE_NO_COPY_CLASS(wxEnhMetaFileSimpleDataObject);
 };
 
-#endif // wxUSE_DRAG_AND_DROP
+#endif // wxUSE_DATAOBJ
 
 #endif // _WX_MSW_ENHMETA_H_
diff --git a/include/wx/msw/metafile.h b/include/wx/msw/metafile.h
index 587c85cb54..acc9467ea6 100644
--- a/include/wx/msw/metafile.h
+++ b/include/wx/msw/metafile.h
@@ -14,7 +14,7 @@
 #include "wx/dc.h"
 #include "wx/gdiobj.h"
 
-#if wxUSE_DRAG_AND_DROP
+#if wxUSE_DATAOBJ
     #include "wx/dataobj.h"
 #endif
 
@@ -155,7 +155,7 @@ bool WXDLLIMPEXP_CORE wxMakeMetaFilePlaceable(const wxString& filename, int x1,
 // wxMetafileDataObject is a specialization of wxDataObject for metafile data
 // ----------------------------------------------------------------------------
 
-#if wxUSE_DRAG_AND_DROP
+#if wxUSE_DATAOBJ
 
 class WXDLLIMPEXP_CORE wxMetafileDataObject : public wxDataObjectSimple
 {
@@ -182,7 +182,7 @@ protected:
     wxMetafile m_metafile;
 };
 
-#endif // wxUSE_DRAG_AND_DROP
+#endif // wxUSE_DATAOBJ
 
 #endif
     // _WX_METAFIILE_H_
diff --git a/src/msw/metafile.cpp b/src/msw/metafile.cpp
index 5f88acdadd..0282cb2bf0 100644
--- a/src/msw/metafile.cpp
+++ b/src/msw/metafile.cpp
@@ -456,7 +456,7 @@ bool wxMakeMetafilePlaceable(const wxString& filename, int x1, int y1, int x2, i
 }
 
 
-#if wxUSE_DRAG_AND_DROP
+#if wxUSE_DATAOBJ
 
 // ----------------------------------------------------------------------------
 // wxMetafileDataObject
@@ -515,6 +515,6 @@ bool wxMetafileDataObject::SetData(size_t WXUNUSED(len), const void *buf)
     return true;
 }
 
-#endif // wxUSE_DRAG_AND_DROP
+#endif // wxUSE_DATAOBJ
 
 #endif // wxUSE_METAFILE