Merged 47226 from trunk:
Don't include <CoreFoundation/CFBase.h> 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/branches/WX_2_8_BRANCH@47401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -17,7 +17,20 @@
|
|||||||
#ifndef _WX_MAC_COREFOUNDATION_CFREF_H__
|
#ifndef _WX_MAC_COREFOUNDATION_CFREF_H__
|
||||||
#define _WX_MAC_COREFOUNDATION_CFREF_H__
|
#define _WX_MAC_COREFOUNDATION_CFREF_H__
|
||||||
|
|
||||||
#include <CoreFoundation/CFBase.h>
|
// #include <CoreFoundation/CFBase.h>
|
||||||
|
/* 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
|
/*! @function wxCFRelease
|
||||||
@abstract A CFRelease variant that checks for NULL before releasing.
|
@abstract A CFRelease variant that checks for NULL before releasing.
|
||||||
|
Reference in New Issue
Block a user