From 5f3c0120ed7efbe3272148eed864ef09b0059a67 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Fri, 20 Mar 2009 07:32:01 +0000 Subject: [PATCH] adding more native definitions git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/defs.h | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/include/wx/defs.h b/include/wx/defs.h index a1877264a9..a845da8d5f 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -2638,16 +2638,24 @@ typedef void* WXDisplay; typedef const void * CFTypeRef; -typedef const struct __CFString * CFStringRef; +// typedef const struct __CFString * CFStringRef; + +#define DECLARE_WXOSX_OPAQUE_CFREF( name ) typedef struct __##name* name##Ref; +#define DECLARE_WXOSX_OPAQUE_CONST_CFREF( name ) typedef const struct __##name* name##Ref; + +DECLARE_WXOSX_OPAQUE_CONST_CFREF( CFString ) typedef struct __CFString * CFMutableStringRef; -typedef struct __CFRunLoopSource * CFRunLoopSourceRef; +DECLARE_WXOSX_OPAQUE_CFREF( CFRunLoopSource ) +DECLARE_WXOSX_OPAQUE_CONST_CFREF( CTFont ) +DECLARE_WXOSX_OPAQUE_CONST_CFREF( CTFontDescriptor ) -#define DECLARE_WXMAC_OPAQUE_CGREF( name ) typedef struct name* name##Ref; +#define DECLARE_WXOSX_OPAQUE_CGREF( name ) typedef struct name* name##Ref; -DECLARE_WXMAC_OPAQUE_CGREF( CGColor ) -DECLARE_WXMAC_OPAQUE_CGREF( CGImage ) -DECLARE_WXMAC_OPAQUE_CGREF( CGContext ) +DECLARE_WXOSX_OPAQUE_CGREF( CGColor ) +DECLARE_WXOSX_OPAQUE_CGREF( CGImage ) +DECLARE_WXOSX_OPAQUE_CGREF( CGContext ) +DECLARE_WXOSX_OPAQUE_CGREF( CGFont ) typedef CGColorRef WXCOLORREF; typedef CGImageRef WXCGIMAGEREF; @@ -2748,6 +2756,8 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSColorPanel); DECLARE_WXCOCOA_OBJC_CLASS(NSControl); DECLARE_WXCOCOA_OBJC_CLASS(NSCursor); DECLARE_WXCOCOA_OBJC_CLASS(NSEvent); +DECLARE_WXCOCOA_OBJC_CLASS(NSFont); +DECLARE_WXCOCOA_OBJC_CLASS(NSFontDescriptor); DECLARE_WXCOCOA_OBJC_CLASS(NSFontPanel); DECLARE_WXCOCOA_OBJC_CLASS(NSImage); DECLARE_WXCOCOA_OBJC_CLASS(NSLayoutManager);