Fix building without precompiled headers on Windows
This commit is contained in:
@@ -14,9 +14,6 @@
|
||||
// Minimum supported client: Windows 8 and Platform Update for Windows 7
|
||||
#define wxD2D_DEVICE_CONTEXT_SUPPORTED 0
|
||||
|
||||
// Ensure no previous defines interfere with the Direct2D API headers
|
||||
#undef GetHwnd
|
||||
|
||||
// We load these functions at runtime from the d2d1.dll.
|
||||
// However, since they are also used inside the d2d1.h header we must provide
|
||||
// implementations matching the exact declarations. These defines ensures we
|
||||
@@ -36,9 +33,7 @@
|
||||
#pragma warning(disable:4458) // declaration of 'xxx' hides class member
|
||||
#endif
|
||||
|
||||
#include <d2d1.h>
|
||||
#include <dwrite.h>
|
||||
#include <wincodec.h>
|
||||
#include "wx/msw/private/graphicsd2d.h"
|
||||
|
||||
#ifdef __MINGW64_TOOLCHAIN__
|
||||
#ifndef DWRITE_E_NOFONT
|
||||
@@ -78,7 +73,6 @@
|
||||
#include "wx/private/graphics.h"
|
||||
#include "wx/stack.h"
|
||||
#include "wx/sharedptr.h"
|
||||
#include "wx/msw/private/graphicsd2d.h"
|
||||
|
||||
// This must be the last header included to only affect the DEFINE_GUID()
|
||||
// occurrences below but not any GUIDs declared in the standard files included
|
||||
|
Reference in New Issue
Block a user