Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't compile Cairo dynamic linking code with GTK

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/cairo.cpp
View File

@@ -15,7 +15,7 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#if wxUSE_CAIRO #if wxUSE_CAIRO && !defined(__WXGTK20__)
// keep cairo.h from defining dllimport as we're defining the symbols inside // keep cairo.h from defining dllimport as we're defining the symbols inside
// the wx dll in order to load them dynamically. // the wx dll in order to load them dynamically.

3
src/generic/graphicc.cpp
View File

@@ -20,9 +20,11 @@
#if wxUSE_CAIRO #if wxUSE_CAIRO
#ifndef __WXGTK20__
// keep cairo.h from defining dllimport as we're defining the symbols inside // keep cairo.h from defining dllimport as we're defining the symbols inside
// the wx dll in order to load them dynamically. // the wx dll in order to load them dynamically.
#define cairo_public #define cairo_public
#endif
#include <cairo.h> #include <cairo.h>
#include <float.h> #include <float.h>
@@ -63,7 +65,6 @@ using namespace std;
// wxGraphicsPath implementation // wxGraphicsPath implementation
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <cairo.h>
#ifdef __WXMSW__ #ifdef __WXMSW__
// TODO remove this dependency (gdiplus needs the macros) // TODO remove this dependency (gdiplus needs the macros)