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.
This commit is contained in:
Artur Wieczorek
2017-05-01 19:30:40 +02:00
parent d7f70fc462
commit 2dd726471f
4 changed files with 9 additions and 9 deletions

View File

@@ -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_