mirror of
				https://github.com/chibicitiberiu/rainmeter-studio.git
				synced 2024-02-24 04:33:31 +00:00 
			
		
		
		
	Remove Platform version helpers and use <VersionHelpers.h> per http://msdn.microsoft.com/en-us/library/windows/desktop/dn424972%28v=vs.85%29.aspx
This commit is contained in:
		@@ -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())
 | 
			
		||||
		{
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user