From 9d4bb4705030a1053ae50d19b375b1960a010e61 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Thu, 30 Apr 2020 09:11:37 -0700
Subject: [PATCH] Don't compile Cairo dynamic linking code with GTK

It's useless as Cairo is always linked to any program using GTK
---
 src/common/cairo.cpp     | 2 +-
 src/generic/graphicc.cpp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/common/cairo.cpp b/src/common/cairo.cpp
index 6879b021e3..a36ab91bd3 100644
--- a/src/common/cairo.cpp
+++ b/src/common/cairo.cpp
@@ -15,7 +15,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_CAIRO
+#if wxUSE_CAIRO && !defined(__WXGTK20__)
 
 // keep cairo.h from defining dllimport as we're defining the symbols inside
 // the wx dll in order to load them dynamically.
diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp
index a5c6f74ca0..244330580a 100644
--- a/src/generic/graphicc.cpp
+++ b/src/generic/graphicc.cpp
@@ -20,9 +20,11 @@
 
 #if wxUSE_CAIRO
 
+#ifndef __WXGTK20__
 // keep cairo.h from defining dllimport as we're defining the symbols inside
 // the wx dll in order to load them dynamically.
 #define cairo_public
+#endif
 
 #include <cairo.h>
 #include <float.h>
@@ -63,7 +65,6 @@ using namespace std;
 // wxGraphicsPath implementation
 //-----------------------------------------------------------------------------
 
-#include <cairo.h>
 #ifdef __WXMSW__
 // TODO remove this dependency (gdiplus needs the macros)