Don't compile Cairo dynamic linking code with GTK

It's useless as Cairo is always linked to any program using GTK
This commit is contained in:
Paul Cornett 2020-04-30 09:11:37 -07:00
parent 861cc376d6
commit 9d4bb47050
2 changed files with 3 additions and 2 deletions

View File

@ -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.

View File

@ -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)