This commit is contained in:
Brian Ferguson
2014-02-12 14:42:02 -07:00
parent eced3a6978
commit 67aeaf5392
21 changed files with 23 additions and 83 deletions

View File

@ -20,7 +20,6 @@
#include "Canvas.h"
#include "CanvasD2D.h"
#include "CanvasGDIP.h"
#include "../Platform.h"
namespace Gfx {
@ -41,7 +40,7 @@ Canvas* Canvas::Create(Renderer renderer)
{
return new CanvasGDIP();
}
else if (renderer == Renderer::D2D && Platform::IsAtLeastWin7())
else if (renderer == Renderer::D2D && IsWindows7OrGreater())
{
if (CanvasD2D::Initialize())
{

View File

@ -17,7 +17,6 @@
*/
#include "StdAfx.h"
#include "../Platform.h"
#include "CanvasD2D.h"
#include "TextFormatD2D.h"
#include "Util/DWriteFontCollectionLoader.h"
@ -69,7 +68,7 @@ bool CanvasD2D::Initialize()
++c_Instances;
if (c_Instances == 1)
{
if (!Platform::IsAtLeastWin7()) return false;
if (!IsWindows7OrGreater()) return false;
D2D1_FACTORY_OPTIONS fo = {};
#ifdef _DEBUG