From 383800a39daf3b9fd407ec47430b07439f1f392f Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Wed, 19 Sep 2007 16:26:25 +0000 Subject: [PATCH] adding defines from wxcocoa to darwin wxmac builds git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@48809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/defs.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/include/wx/defs.h b/include/wx/defs.h index 70d15fa789..475e18f5d7 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -2414,7 +2414,7 @@ typedef void* WXDisplay; #endif -#ifdef __WXCOCOA__ +#if defined( __WXCOCOA__ ) || ( defined(__WXMAC__) && defined(__DARWIN__) ) /* Definitions of 32-bit/64-bit types * These are typedef'd exactly the same way in newer OS X headers so @@ -2509,8 +2509,14 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSTextStorage); DECLARE_WXCOCOA_OBJC_CLASS(NSThread); DECLARE_WXCOCOA_OBJC_CLASS(NSWindow); DECLARE_WXCOCOA_OBJC_CLASS(NSView); +#ifdef __WXMAC__ +// things added for __WXMAC__ +DECLARE_WXCOCOA_OBJC_CLASS(NSString); +#else +// things only for __WXCOCOA__ typedef WX_NSView WXWidget; /* wxWidgets BASE definition */ -#endif /* __WXCOCOA__ */ +#endif +#endif /* __WXCOCOA__ || ( __WXMAC__ &__DARWIN__)*/ #if defined(__WXPALMOS__)