Add imm32.lib to wxStyledTextCtrl

This commit is contained in:
wangqr 2020-05-10 23:04:49 -04:00
parent e07640fb75
commit f730da3c14
4 changed files with 14 additions and 0 deletions

View File

@ -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>

View File

@ -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>

View File

@ -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)

View File

@ -1438,6 +1438,10 @@ sptr_t ScintillaWX::DirectFunction(
#ifdef __WXMSW__
#ifdef __VISUALC__
#pragma comment(lib, "imm32.lib")
#endif
namespace {
POINT POINTFromPoint(Point pt) wxNOEXCEPT {