remove unused macro definitions

and limit others to the configurations which use them

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-04-04 16:44:30 +00:00
parent 010e897e48
commit 9b41d18b25
18 changed files with 31 additions and 92 deletions

View File

@@ -59,6 +59,8 @@ using namespace std;
// wxGraphicsPath implementation
//-----------------------------------------------------------------------------
#include <cairo.h>
#ifdef __WXMSW__
// TODO remove this dependency (gdiplus needs the macros)
#ifndef max
@@ -69,8 +71,6 @@ using namespace std;
#define min(a,b) (((a) < (b)) ? (a) : (b))
#endif
#include <cairo.h>
#ifdef __WXMSW__
#include <cairo-win32.h>
// Notice that the order is important: cairo-win32.h includes windows.h which
// pollutes the global name space with macros so include our own header which