From 8361bffa4ad4e9b8377c587e8e986caa989847f7 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Fri, 23 Nov 2007 19:16:05 +0000
Subject: [PATCH] mac cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50191 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
include/wx/apptrait.h | 4 ----
include/wx/defs.h | 7 ++++++-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h
index 322b047c8e..7264604bd3 100644
--- a/include/wx/apptrait.h
+++ b/include/wx/apptrait.h
@@ -183,8 +183,6 @@ protected:
#include "wx/msw/apptbase.h"
#elif defined(__UNIX__) && !defined(__EMX__)
#include "wx/unix/apptbase.h"
-#elif defined(__WXMAC__)
- #include "wx/mac/apptbase.h"
#elif defined(__OS2__)
#include "wx/os2/apptbase.h"
#else // no platform-specific methods to add to wxAppTraits
@@ -300,8 +298,6 @@ public:
#include "wx/os2/apptrait.h"
#elif defined(__UNIX__)
#include "wx/unix/apptrait.h"
-#elif defined(__WXMAC__)
- #include "wx/mac/apptrait.h"
#elif defined(__DOS__)
#include "wx/msdos/apptrait.h"
#else
diff --git a/include/wx/defs.h b/include/wx/defs.h
index 5d1d87415c..47512f3e4e 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -2534,11 +2534,16 @@ typedef struct __CFString * CFMutableStringRef;
typedef struct __CFRunLoopSource * CFRunLoopSourceRef;
-typedef struct CGColor *CGColorRef;
+#define DECLARE_WXMAC_OPAQUE_CGREF( name ) typedef struct name* name##Ref;
+
+DECLARE_WXMAC_OPAQUE_CGREF( CGColor );
+DECLARE_WXMAC_OPAQUE_CGREF( CGImage );
+DECLARE_WXMAC_OPAQUE_CGREF( CGContext );
#define DECLARE_WXMAC_OPAQUE_REF( name ) typedef struct Opaque##name* name;
DECLARE_WXMAC_OPAQUE_REF( PasteboardRef );
+DECLARE_WXMAC_OPAQUE_REF( IconRef );
#endif
--
2.47.2