solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Add wxStyledTextCtrl XRC handler

Browse source 
Closes https://github.com/wxWidgets/wxWidgets/pull/2530

Co-authored-by: VZ <vz-github@zeitlins.org>
This commit is contained in:
Alexander Koshelev 2021-09-22 20:22:39 +02:00 • committed by Vadim Zeitlin
parent adef4c27c2
commit e2aca9cbd5
15 changed files with 201 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
build/msw/makefile.vc
View file

@ -1791,7 +1791,8 @@ STCDLL_OBJECTS = \
$(OBJS)\stcdll_dummy.obj \
$(OBJS)\stcdll_stc.obj \
$(OBJS)\stcdll_PlatWX.obj \
$(OBJS)\stcdll_ScintillaWX.obj
$(OBJS)\stcdll_ScintillaWX.obj \
$(OBJS)\stcdll_xh_styledtextctrl.obj
STCDLL_RESOURCES = \
$(OBJS)\stcdll_version.res
STCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_596)$(__DEBUGRUNTIME) /DWIN32 \
@ -1813,7 +1814,8 @@ STCLIB_OBJECTS = \
$(OBJS)\stclib_dummy.obj \
$(OBJS)\stclib_stc.obj \
$(OBJS)\stclib_PlatWX.obj \
$(OBJS)\stclib_ScintillaWX.obj
$(OBJS)\stclib_ScintillaWX.obj \
$(OBJS)\stclib_xh_styledtextctrl.obj
GLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_612)$(__DEBUGRUNTIME) /DWIN32 \
/I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib \
/I..\..\3rdparty\pcre\src\wx /I..\..\src\expat\expat\lib $(__DEBUGINFO) \
@ -2865,7 +2867,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
____MONOLIB_STC_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_stc.obj \
$(OBJS)\monodll_PlatWX.obj \
$(OBJS)\monodll_ScintillaWX.obj
$(OBJS)\monodll_ScintillaWX.obj \
$(OBJS)\monodll_xh_styledtextctrl.obj
!endif
!if "$(USE_STC)" == "1"
__wxscintilla_library_link_DEP = $(__wxscintilla)
@ -3707,7 +3710,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
____MONOLIB_STC_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_stc.obj \
$(OBJS)\monolib_PlatWX.obj \
$(OBJS)\monolib_ScintillaWX.obj
$(OBJS)\monolib_ScintillaWX.obj \
$(OBJS)\monolib_xh_styledtextctrl.obj
!endif
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
__basedll___depname = \
@ -8501,6 +8505,9 @@ $(OBJS)\monodll_PlatWX.obj: ..\..\src\stc\PlatWX.cpp
$(OBJS)\monodll_ScintillaWX.obj: ..\..\src\stc\ScintillaWX.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\stc\ScintillaWX.cpp
$(OBJS)\monodll_xh_styledtextctrl.obj: ..\..\src\xrc\xh_styledtextctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_styledtextctrl.cpp
$(OBJS)\monodll_xml.obj: ..\..\src\xml\xml.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xml\xml.cpp
@ -11075,6 +11082,9 @@ $(OBJS)\monolib_PlatWX.obj: ..\..\src\stc\PlatWX.cpp
$(OBJS)\monolib_ScintillaWX.obj: ..\..\src\stc\ScintillaWX.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\stc\ScintillaWX.cpp
$(OBJS)\monolib_xh_styledtextctrl.obj: ..\..\src\xrc\xh_styledtextctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_styledtextctrl.cpp
$(OBJS)\monolib_xml.obj: ..\..\src\xml\xml.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xml\xml.cpp
@ -17756,6 +17766,9 @@ $(OBJS)\stcdll_PlatWX.obj: ..\..\src\stc\PlatWX.cpp
$(OBJS)\stcdll_ScintillaWX.obj: ..\..\src\stc\ScintillaWX.cpp
$(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) ..\..\src\stc\ScintillaWX.cpp
$(OBJS)\stcdll_xh_styledtextctrl.obj: ..\..\src\xrc\xh_styledtextctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) ..\..\src\xrc\xh_styledtextctrl.cpp
$(OBJS)\stclib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
@ -17768,6 +17781,9 @@ $(OBJS)\stclib_PlatWX.obj: ..\..\src\stc\PlatWX.cpp
$(OBJS)\stclib_ScintillaWX.obj: ..\..\src\stc\ScintillaWX.cpp
$(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) ..\..\src\stc\ScintillaWX.cpp
$(OBJS)\stclib_xh_styledtextctrl.obj: ..\..\src\xrc\xh_styledtextctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) ..\..\src\xrc\xh_styledtextctrl.cpp
$(OBJS)\gldll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp