From b318b84860934641df49936181ec13ec42fb9151 Mon Sep 17 00:00:00 2001 From: Nomango <569629550@qq.com> Date: Sun, 1 Apr 2018 13:22:15 +0800 Subject: [PATCH] Revert "fixed _MSC_VER" This reverts commit 8a9d9a4f109c9b33696cce42a39b65e197bb3593. --- core/Common/Scene.cpp | 2 +- core/Node/Text.cpp | 2 +- core/emacros.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/Common/Scene.cpp b/core/Common/Scene.cpp index 62a5ad84..a6a95283 100644 --- a/core/Common/Scene.cpp +++ b/core/Common/Scene.cpp @@ -73,7 +73,7 @@ e2d::Node * e2d::Scene::getRoot() const return m_pRoot; } -void e2d::Scene::setShapeVisiable(bool visiable) +void e2d::Scene::showOutline(bool visiable) { m_bShapeVisiable = visiable; } diff --git a/core/Node/Text.cpp b/core/Node/Text.cpp index 224c7854..d73f0129 100644 --- a/core/Node/Text.cpp +++ b/core/Node/Text.cpp @@ -205,7 +205,7 @@ void e2d::Text::onRender() if (m_pDWriteTextLayout) { Renderer::getRenderTarget()->DrawTextLayout( - { 0, 0 }, + D2D1::Point2F(0, 0), m_pDWriteTextLayout, Renderer::getSolidColorBrush() ); diff --git a/core/emacros.h b/core/emacros.h index 0a18e361..0a150c7f 100644 --- a/core/emacros.h +++ b/core/emacros.h @@ -73,7 +73,7 @@ EXTERN_C IMAGE_DOS_HEADER __ImageBase; #endif -#if _MSC_VER > 1700 +#if _MSC_VER <= 1700 #define HIGHER_THAN_VS2012 1 #else #define HIGHER_THAN_VS2012 0