From b05ea5f8f41f1aa831eb63501b0498c0c50b8654 Mon Sep 17 00:00:00 2001
From: Kolya Kosenko <kosenko@trac.wxwidgets.org>
Date: Tue, 13 Sep 2016 12:59:00 +0200
Subject: [PATCH] Improve build instructions for wxGTK/MSW

Extract the patch that needs to be applied from the documentation and move it
to a separate file.

Closes #17659.
---
 docs/msw/gtk.txt      | 21 ++-------------------
 docs/msw/gtkfix.patch | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 19 deletions(-)
 create mode 100644 docs/msw/gtkfix.patch

diff --git a/docs/msw/gtk.txt b/docs/msw/gtk.txt
index 7e7640c845..6756ea61ec 100644
--- a/docs/msw/gtk.txt
+++ b/docs/msw/gtk.txt
@@ -14,26 +14,9 @@ Building steps:
 and be able to build wxWidgets as described in docs/msw/install.txt
 
 2. wxGTK/Win32 is disabled by default in wxWidgets, you need to enable it
-in bakefiles manually. TOOLKIT variable should not be a constantly MSW
-for required bakefile formats.
-
-
-diff build/bakefiles/config.bkl build/bakefiles/config.bkl
---- build/bakefiles/config.bkl
-+++ build/bakefiles/config.bkl
-@@ -67,9 +67,9 @@
-         </if>
- 
-         <!-- We must make TOOLKIT a constant under Windows -->
--        <if cond="FORMAT in ['borland','mingw','msvc','watcom', 'msvc6prj', 'msvs2003prj', 'msvs2005prj', 'msvs2008prj']">
-+        <!--if cond="FORMAT in ['borland','mingw','msvc','watcom', 'msvc6prj', 'msvs2003prj', 'msvs2005prj', 'msvs2008prj']">
-             <set var="TOOLKIT">MSW</set>
--        </if>
-+        </if-->
-     </if>
- 
-     <!--
+in bakefiles manually. Apply following patch manually or using Cygwin:
 
+    patch -p0 < docs/msw/gtkfix.patch
 
 Regenerate required make/project files:
     cd build\bakefiles
diff --git a/docs/msw/gtkfix.patch b/docs/msw/gtkfix.patch
new file mode 100644
index 0000000000..d79ea695d5
--- /dev/null
+++ b/docs/msw/gtkfix.patch
@@ -0,0 +1,24 @@
+--- build/bakefiles/common.bkl
++++ build/bakefiles/common.bkl
+@@ -423,6 +423,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
+         <if cond="IS_MSVC_PRJ">
+             <msvc-headers-setup-h>
+                 msw/setup.h
++                gtk/setup.h
+                 univ/setup.h
+             </msvc-headers-setup-h>
+             <set var="_custom_build_include_wx_msw_setup_h">
+--- build/bakefiles/config.bkl
++++ build/bakefiles/config.bkl
+@@ -64,11 +64,6 @@
+                 </description>
+             </option>
+         </if>
+-
+-        <!-- We must make TOOLKIT a constant under Windows -->
+-        <if cond="FORMAT in ['borland','mingw','msvc','watcom', 'msvc6prj', 'msvs2003prj', 'msvs2005prj', 'msvs2008prj']">
+-            <set var="TOOLKIT">MSW</set>
+-        </if>
+     </if>
+
+     <!--