Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.gcc
View File

@@ -1595,7 +1595,8 @@ STCDLL_OBJECTS = \
$(OBJS)\stcdll_version_rc.o \
$(OBJS)\stcdll_stc.o \
$(OBJS)\stcdll_PlatWX.o \
$(OBJS)\stcdll_ScintillaWX.o
$(OBJS)\stcdll_ScintillaWX.o \
$(OBJS)\stcdll_xh_styledtextctrl.o
STCLIB_CXXFLAGS = -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \
-I..\..\src\zlib -I..\..\3rdparty\pcre\src\wx -I..\..\src\expat\expat\lib \
$(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ \
@@ -1611,7 +1612,8 @@ STCLIB_OBJECTS = \
$(OBJS)\stclib_dummy.o \
$(OBJS)\stclib_stc.o \
$(OBJS)\stclib_PlatWX.o \
$(OBJS)\stclib_ScintillaWX.o
$(OBJS)\stclib_ScintillaWX.o \
$(OBJS)\stclib_xh_styledtextctrl.o
GLDLL_CXXFLAGS = -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \
-I..\..\src\zlib -I..\..\3rdparty\pcre\src\wx -I..\..\src\expat\expat\lib \
$(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ \
@@ -2538,7 +2540,8 @@ ifeq ($(USE_STC),1)
____MONOLIB_STC_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_stc.o \
$(OBJS)\monodll_PlatWX.o \
$(OBJS)\monodll_ScintillaWX.o
$(OBJS)\monodll_ScintillaWX.o \
$(OBJS)\monodll_xh_styledtextctrl.o
endif
ifeq ($(USE_STC),1)
__wxscintilla_library_link_DEP = $(__wxscintilla)
@@ -3380,7 +3383,8 @@ ifeq ($(USE_STC),1)
____MONOLIB_STC_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_stc.o \
$(OBJS)\monolib_PlatWX.o \
$(OBJS)\monolib_ScintillaWX.o
$(OBJS)\monolib_ScintillaWX.o \
$(OBJS)\monolib_xh_styledtextctrl.o
endif
ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),1)
@@ -8070,6 +8074,9 @@ $(OBJS)\monodll_PlatWX.o: ../../src/stc/PlatWX.cpp
$(OBJS)\monodll_ScintillaWX.o: ../../src/stc/ScintillaWX.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_xh_styledtextctrl.o: ../../src/xrc/xh_styledtextctrl.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_xml.o: ../../src/xml/xml.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -10644,6 +10651,9 @@ $(OBJS)\monolib_PlatWX.o: ../../src/stc/PlatWX.cpp
$(OBJS)\monolib_ScintillaWX.o: ../../src/stc/ScintillaWX.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_xh_styledtextctrl.o: ../../src/xrc/xh_styledtextctrl.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_xml.o: ../../src/xml/xml.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -17325,6 +17335,9 @@ $(OBJS)\stcdll_PlatWX.o: ../../src/stc/PlatWX.cpp
$(OBJS)\stcdll_ScintillaWX.o: ../../src/stc/ScintillaWX.cpp
$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\stcdll_xh_styledtextctrl.o: ../../src/xrc/xh_styledtextctrl.cpp
$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\stclib_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -17337,6 +17350,9 @@ $(OBJS)\stclib_PlatWX.o: ../../src/stc/PlatWX.cpp
$(OBJS)\stclib_ScintillaWX.o: ../../src/stc/ScintillaWX.cpp
$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\stclib_xh_styledtextctrl.o: ../../src/xrc/xh_styledtextctrl.cpp
$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\gldll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(GLDLL_CXXFLAGS) $(CPPDEPS) $<