From c03ae2a8f8c23ebd0bef19d1f3065337b7af0a29 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 13 Mar 2016 15:37:08 +0100 Subject: [PATCH] Propagate changes to generated wx/msw/setup0.h back to setup_inc.h Changes of d053a904865fc14574bf09ca2c227055aa82ca32 only updated the generated wx/msw/setup0.h file but not the file wx/msw/setup_inc.h from which it is generated and so would have been lost after the next modification to the latter. Modify the latter one too to ensure that the changes stick. See https://github.com/wxWidgets/wxWidgets/pull/238 --- include/wx/gtk/setup0.h | 2 +- include/wx/msw/setup_inc.h | 2 +- setup.h.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wx/gtk/setup0.h b/include/wx/gtk/setup0.h index c734961a4d..0ab4718bdf 100644 --- a/include/wx/gtk/setup0.h +++ b/include/wx/gtk/setup0.h @@ -1560,7 +1560,7 @@ // SDK components manually, you need to change this setting. // // Recommended setting: 1 -#if defined(_MSC_VER) && _MSC_VER >= 1700 +#if defined(_MSC_VER) && _MSC_VER >= 1700 && !defined(_USING_V110_SDK71_) #define wxUSE_WINRT 1 #else #define wxUSE_WINRT 0 diff --git a/include/wx/msw/setup_inc.h b/include/wx/msw/setup_inc.h index eb01cbd540..639fbe6523 100644 --- a/include/wx/msw/setup_inc.h +++ b/include/wx/msw/setup_inc.h @@ -72,7 +72,7 @@ // SDK components manually, you need to change this setting. // // Recommended setting: 1 -#if defined(_MSC_VER) && _MSC_VER >= 1700 +#if defined(_MSC_VER) && _MSC_VER >= 1700 && !defined(_USING_V110_SDK71_) #define wxUSE_WINRT 1 #else #define wxUSE_WINRT 0 diff --git a/setup.h.in b/setup.h.in index 6965f925da..6929ae0a48 100644 --- a/setup.h.in +++ b/setup.h.in @@ -655,7 +655,7 @@ #define wxUSE_ACTIVEX 0 -#if defined(_MSC_VER) && _MSC_VER >= 1700 +#if defined(_MSC_VER) && _MSC_VER >= 1700 && !defined(_USING_V110_SDK71_) #define wxUSE_WINRT 0 #else #define wxUSE_WINRT 0