From 4f9cd1cb7f5ec341d322a4d16d933560699bde1f Mon Sep 17 00:00:00 2001 From: Ryan Norton Date: Fri, 4 Feb 2005 05:59:28 +0000 Subject: [PATCH] use wx/math.h for math constants - avoids redifinition warnings git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/cocoa/dc.mm | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/cocoa/dc.mm b/src/cocoa/dc.mm index 94578291b6..b6ee3bf591 100644 --- a/src/cocoa/dc.mm +++ b/src/cocoa/dc.mm @@ -28,6 +28,7 @@ #import #import +#include "wx/math.h" //math constants #include "wx/listimpl.cpp" WX_DEFINE_LIST(wxCocoaDCStack); @@ -365,17 +366,6 @@ int wxDCBase::LogicalToDeviceYRel(int y) const // cut here, the rest is stubs /////////////////////////////////////////////////////////////////////////// -//----------------------------------------------------------------------------- -// constants -//----------------------------------------------------------------------------- - -#define mm2inches 0.0393700787402 -#define inches2mm 25.4 -#define mm2twips 56.6929133859 -#define twips2mm 0.0176388888889 -#define mm2pt 2.83464566929 -#define pt2mm 0.352777777778 - //----------------------------------------------------------------------------- // wxDC //-----------------------------------------------------------------------------