From d0b5a8ed8e524f63a1c91383823c7af44adc0574 Mon Sep 17 00:00:00 2001 From: Sergey Fedorov Date: Fri, 26 Jul 2024 12:01:50 +0800 Subject: [PATCH 05/13] defs.h: fix --- include/wx/defs.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/include/wx/defs.h b/include/wx/defs.h index 39ce129477..ebb75ebd07 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -2811,10 +2811,6 @@ typedef int (* LINKAGEMODE wxListIterateFunction)(void *current); #define DECLARE_WXOSX_OPAQUE_CFREF( name ) typedef struct __##name* name##Ref; #define DECLARE_WXOSX_OPAQUE_CONST_CFREF( name ) typedef const struct __##name* name##Ref; -#endif - -#ifdef __WXMAC__ - #define WX_OPAQUE_TYPE( name ) struct wxOpaque##name typedef void* WXHCURSOR; @@ -2832,7 +2828,9 @@ typedef unsigned short WXWORD; typedef WX_OPAQUE_TYPE(PicHandle ) * WXHMETAFILE ; +#if !defined(__WXX11__) && !defined(__WXGTK__) typedef void* WXDisplay; +#endif /* * core frameworks