From 60d9f403a2a7efd45f22d0c544e442cdaff6ba55 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 1 Jun 2017 00:38:08 +0200 Subject: [PATCH] Only declare wxSetClipboardData() in wxMSW when it's defined This is only the case when full OLE support is disabled. See https://github.com/wxWidgets/wxWidgets/pull/491 --- include/wx/msw/clipbrd.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/wx/msw/clipbrd.h b/include/wx/msw/clipbrd.h index fca86898ff..2033e5f94d 100644 --- a/include/wx/msw/clipbrd.h +++ b/include/wx/msw/clipbrd.h @@ -24,9 +24,11 @@ WXDLLIMPEXP_CORE bool wxCloseClipboard(); // get/set data WXDLLIMPEXP_CORE bool wxEmptyClipboard(); +#if !wxUSE_OLE WXDLLIMPEXP_CORE bool wxSetClipboardData(wxDataFormat dataFormat, const void *data, int width = 0, int height = 0); +#endif // !wxUSE_OLE // clipboard formats WXDLLIMPEXP_CORE bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat);