From 9ed8b5a7b2e41ecb07d2dab32bac32eb7b771fd3 Mon Sep 17 00:00:00 2001 From: David Elliott Date: Sat, 7 Jul 2007 22:10:02 +0000 Subject: [PATCH] Don't include because it in turn includes MacTypes.h which causes too much namespace pollution. Instead, declare the CFTypeRef type and the CFRelease and CFRetain functions. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/mac/corefoundation/cfref.h | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/include/wx/mac/corefoundation/cfref.h b/include/wx/mac/corefoundation/cfref.h index 7506791c0f..53d46e78c1 100644 --- a/include/wx/mac/corefoundation/cfref.h +++ b/include/wx/mac/corefoundation/cfref.h @@ -17,7 +17,20 @@ #ifndef _WX_MAC_COREFOUNDATION_CFREF_H__ #define _WX_MAC_COREFOUNDATION_CFREF_H__ -#include +// #include +/* Don't include CFBase.h such that this header can be included from public + * headers with minimal namespace pollution. + * Note that Darwin CF uses extern for CF_EXPORT. If we need this on Win32 + * or non-Darwin Mac OS we'll need to define the appropriate __declspec. + */ +extern "C" { +typedef const void *CFTypeRef; +extern /* CF_EXPORT */ +CFTypeRef CFRetain(CFTypeRef cf); +extern /* CF_EXPORT */ +void CFRelease(CFTypeRef cf); +} // extern "C" + /*! @function wxCFRelease @abstract A CFRelease variant that checks for NULL before releasing. -- 2.45.2