From 21cc8a4e498fab38659ab5aefe34edf054e2ff21 Mon Sep 17 00:00:00 2001 From: Tobias Taschner Date: Wed, 15 Jan 2020 15:58:10 +0100 Subject: [PATCH] Update setup.h files --- build/cmake/setup.h.in | 1 - include/wx/android/setup.h | 3 +-- include/wx/gtk/setup0.h | 3 +-- include/wx/motif/setup0.h | 3 +-- include/wx/msw/setup0.h | 3 +-- include/wx/osx/setup0.h | 3 +-- include/wx/univ/setup0.h | 3 +-- setup.h.in | 1 - 8 files changed, 6 insertions(+), 14 deletions(-) diff --git a/build/cmake/setup.h.in b/build/cmake/setup.h.in index abc2bfba7e..c18154227b 100644 --- a/build/cmake/setup.h.in +++ b/build/cmake/setup.h.in @@ -631,7 +631,6 @@ #cmakedefine01 wxUSE_THEME_MONO #cmakedefine01 wxUSE_THEME_WIN32 - /* --- end common options --- */ /* diff --git a/include/wx/android/setup.h b/include/wx/android/setup.h index 485b3c11dd..af4585828d 100644 --- a/include/wx/android/setup.h +++ b/include/wx/android/setup.h @@ -761,7 +761,7 @@ // Use the Edge (Chromium) wxWebView backend (Requires WebView2 SDK) // -// Default is 0 +// Default is 0 because WebView2 is not always available, set it to 1 if you do have it. // // Recommended setting: 1 when building for Windows with WebView2 SDK #define wxUSE_WEBVIEW_EDGE 0 @@ -1559,7 +1559,6 @@ #define wxUSE_THEME_MONO 0 #define wxUSE_THEME_WIN32 0 - /* --- end common options --- */ /* --- start MSW options --- */ diff --git a/include/wx/gtk/setup0.h b/include/wx/gtk/setup0.h index 230560034a..639f912d52 100644 --- a/include/wx/gtk/setup0.h +++ b/include/wx/gtk/setup0.h @@ -762,7 +762,7 @@ // Use the Edge (Chromium) wxWebView backend (Requires WebView2 SDK) // -// Default is 0 +// Default is 0 because WebView2 is not always available, set it to 1 if you do have it. // // Recommended setting: 1 when building for Windows with WebView2 SDK #define wxUSE_WEBVIEW_EDGE 0 @@ -1560,7 +1560,6 @@ #define wxUSE_THEME_MONO 0 #define wxUSE_THEME_WIN32 0 - /* --- end common options --- */ /* --- start MSW options --- */ diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h index 922189d5cb..7f7ff9eb8a 100644 --- a/include/wx/motif/setup0.h +++ b/include/wx/motif/setup0.h @@ -762,7 +762,7 @@ // Use the Edge (Chromium) wxWebView backend (Requires WebView2 SDK) // -// Default is 0 +// Default is 0 because WebView2 is not always available, set it to 1 if you do have it. // // Recommended setting: 1 when building for Windows with WebView2 SDK #define wxUSE_WEBVIEW_EDGE 0 @@ -1560,7 +1560,6 @@ #define wxUSE_THEME_MONO 0 #define wxUSE_THEME_WIN32 0 - /* --- end common options --- */ #endif // _WX_SETUP_H_ diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index 471dd40401..e7b9d06668 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -762,7 +762,7 @@ // Use the Edge (Chromium) wxWebView backend (Requires WebView2 SDK) // -// Default is 0 +// Default is 0 because WebView2 is not always available, set it to 1 if you do have it. // // Recommended setting: 1 when building for Windows with WebView2 SDK #define wxUSE_WEBVIEW_EDGE 0 @@ -1560,7 +1560,6 @@ #define wxUSE_THEME_MONO 0 #define wxUSE_THEME_WIN32 0 - /* --- end common options --- */ /* --- start MSW options --- */ diff --git a/include/wx/osx/setup0.h b/include/wx/osx/setup0.h index bcdab60411..d45ea59db7 100644 --- a/include/wx/osx/setup0.h +++ b/include/wx/osx/setup0.h @@ -768,7 +768,7 @@ // Use the Edge (Chromium) wxWebView backend (Requires WebView2 SDK) // -// Default is 0 +// Default is 0 because WebView2 is not always available, set it to 1 if you do have it. // // Recommended setting: 1 when building for Windows with WebView2 SDK #define wxUSE_WEBVIEW_EDGE 0 @@ -1566,7 +1566,6 @@ #define wxUSE_THEME_MONO 0 #define wxUSE_THEME_WIN32 0 - /* --- end common options --- */ /* --- start OSX options --- */ diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h index 00f7923f77..7c2852039b 100644 --- a/include/wx/univ/setup0.h +++ b/include/wx/univ/setup0.h @@ -761,7 +761,7 @@ // Use the Edge (Chromium) wxWebView backend (Requires WebView2 SDK) // -// Default is 0 +// Default is 0 because WebView2 is not always available, set it to 1 if you do have it. // // Recommended setting: 1 when building for Windows with WebView2 SDK #define wxUSE_WEBVIEW_EDGE 0 @@ -1559,7 +1559,6 @@ #define wxUSE_THEME_MONO 0 #define wxUSE_THEME_WIN32 0 - /* --- end common options --- */ /* --- start MSW options --- */ diff --git a/setup.h.in b/setup.h.in index 6164e14d8d..26ed7a7d14 100644 --- a/setup.h.in +++ b/setup.h.in @@ -631,7 +631,6 @@ #define wxUSE_THEME_MONO 0 #define wxUSE_THEME_WIN32 0 - /* --- end common options --- */ /*