From f730da3c14927b1833fc776479bd457b494bb30e Mon Sep 17 00:00:00 2001
From: wangqr <wangqr@wangqr.tk>
Date: Sun, 10 May 2020 23:04:49 -0400
Subject: [PATCH] Add imm32.lib to wxStyledTextCtrl

---
 build/bakefiles/config.bkl         | 6 ++++++
 build/bakefiles/multilib.bkl       | 1 +
 build/cmake/lib/stc/CMakeLists.txt | 3 +++
 src/stc/ScintillaWX.cpp            | 4 ++++
 4 files changed, 14 insertions(+)

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index b08c08dada..1e5459260c 100644
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -411,6 +411,7 @@ compiled .lib files and setup.h under the lib/ toplevel directory.
         <option name="EXTRALIBS_GUI"/>
         <option name="EXTRALIBS_OPENGL"/>
         <option name="EXTRALIBS_SDL"/>
+        <option name="EXTRALIBS_STC"/>
         <option name="EXTRALIBS_WEBVIEW"/>
         <option name="WX_CPPFLAGS"/>
         <option name="WX_CFLAGS"/>
@@ -492,6 +493,11 @@ it if SHARED=1 unless you know what you are doing.
             <if cond="COMPILER=='gcc'">-lopengl32 -lglu32</if>
         </set>
         <set var="EXTRALIBS_SDL"/>
+        <set var="EXTRALIBS_STC">
+            <if cond="COMPILER=='wat' and TOOLKIT=='MSW'">imm32.lib</if>
+            <if cond="COMPILER=='vc' and TOOLKIT=='MSW'">imm32.lib</if>
+            <if cond="COMPILER=='gcc' and TOOLKIT=='MSW'">-limm32</if>
+        </set>
         <set var="EXTRALIBS_WEBVIEW"/>
 
         <set var="WITH_PLUGIN_SDL">0</set>
diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index b9ec796c82..3367df44bc 100644
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -402,6 +402,7 @@
         <sources>$(STC_SRC)</sources>
         <library>coredll</library>
         <library>basedll</library>
+        <ldlibs>$(EXTRALIBS_STC)</ldlibs>
         <msvc-headers>$(STC_HDR)</msvc-headers>
     </dll>
 
diff --git a/build/cmake/lib/stc/CMakeLists.txt b/build/cmake/lib/stc/CMakeLists.txt
index f96687d2d8..1640e910c1 100644
--- a/build/cmake/lib/stc/CMakeLists.txt
+++ b/build/cmake/lib/stc/CMakeLists.txt
@@ -195,5 +195,8 @@ wx_lib_compile_definitions(stc PRIVATE
     LINK_LEXERS
 )
 wx_lib_link_libraries(stc PRIVATE wxscintilla)
+if(WXMSW)
+    wx_lib_link_libraries(stc PRIVATE imm32)
+endif()
 
 wx_finalize_lib(stc)
diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index 9ac400fdba..54f9e4afce 100644
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -1438,6 +1438,10 @@ sptr_t ScintillaWX::DirectFunction(
 
 #ifdef __WXMSW__
 
+#ifdef __VISUALC__
+#pragma comment(lib, "imm32.lib")
+#endif
+
 namespace {
 
 POINT POINTFromPoint(Point pt) wxNOEXCEPT {