From 294c8a6b23de686436a36f076de6a004a110a4d1 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Tue, 5 Nov 2019 19:20:51 +0100 Subject: [PATCH] moving datatransfer.h to source files former place in private.h broke Audacity builds --- include/wx/osx/private.h | 1 - src/osx/carbon/clipbrd.cpp | 1 + src/osx/carbon/dataobj.cpp | 1 + src/osx/cocoa/dnd.mm | 1 + src/osx/cocoa/window.mm | 1 + 5 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/wx/osx/private.h b/include/wx/osx/private.h index a49a4166f8..23fd0025fb 100644 --- a/include/wx/osx/private.h +++ b/include/wx/osx/private.h @@ -2,7 +2,6 @@ #define _WX_PRIVATE_OSX_H_ #include "wx/osx/core/private.h" -#include "wx/osx/private/datatransfer.h" #if wxOSX_USE_IPHONE #include "wx/osx/iphone/private.h" diff --git a/src/osx/carbon/clipbrd.cpp b/src/osx/carbon/clipbrd.cpp index 6012d3747e..6c463d0d99 100644 --- a/src/osx/carbon/clipbrd.cpp +++ b/src/osx/carbon/clipbrd.cpp @@ -28,6 +28,7 @@ #include "wx/scopedarray.h" #include "wx/osx/private.h" +#include "wx/osx/private/datatransfer.h" #define wxUSE_DATAOBJ 1 diff --git a/src/osx/carbon/dataobj.cpp b/src/osx/carbon/dataobj.cpp index 61e37b7e2b..2dbf820461 100644 --- a/src/osx/carbon/dataobj.cpp +++ b/src/osx/carbon/dataobj.cpp @@ -30,6 +30,7 @@ #include "wx/filename.h" #include "wx/osx/private.h" +#include "wx/osx/private/datatransfer.h" static CFStringRef kUTTypeTraditionalMacText = CFSTR("com.apple.traditional-mac-plain-text"); diff --git a/src/osx/cocoa/dnd.mm b/src/osx/cocoa/dnd.mm index 6ff71f619d..019d2adb18 100644 --- a/src/osx/cocoa/dnd.mm +++ b/src/osx/cocoa/dnd.mm @@ -30,6 +30,7 @@ #include "wx/evtloop.h" #include "wx/osx/private.h" +#include "wx/osx/private/datatransfer.h" wxOSXDataSinkItem::~wxOSXDataSinkItem() { diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm index 8a8a12b948..a589187a8e 100644 --- a/src/osx/cocoa/window.mm +++ b/src/osx/cocoa/window.mm @@ -22,6 +22,7 @@ #ifdef __WXMAC__ #include "wx/osx/private.h" #include "wx/osx/private/available.h" + #include "wx/osx/private/datatransfer.h" #endif #include "wx/evtloop.h"