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
This commit is contained in:
@@ -28,6 +28,7 @@
|
|||||||
#import <AppKit/NSTypesetter.h>
|
#import <AppKit/NSTypesetter.h>
|
||||||
#import <AppKit/NSImage.h>
|
#import <AppKit/NSImage.h>
|
||||||
|
|
||||||
|
#include "wx/math.h" //math constants
|
||||||
#include "wx/listimpl.cpp"
|
#include "wx/listimpl.cpp"
|
||||||
WX_DEFINE_LIST(wxCocoaDCStack);
|
WX_DEFINE_LIST(wxCocoaDCStack);
|
||||||
|
|
||||||
@@ -365,17 +366,6 @@ int wxDCBase::LogicalToDeviceYRel(int y) const
|
|||||||
// cut here, the rest is stubs
|
// 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
|
// wxDC
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
Reference in New Issue
Block a user