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

Factor out common code from most wxBookCtrl-related XRC handlers

Browse source 
Add new wxBookCtrlXmlHandlerBase and inherit the XRC handlers of all the
wxBookCtrlBase-derived classes except for wxTreebookXmlHandler, which
will require special handling, from it to avoid duplicating the same
code in all of them.

This commit is best viewed with --color-moved git option.
This commit is contained in:
Vadim Zeitlin 2022-02-24 01:07:21 +00:00
parent 1d3149292c
commit 1549aafdc9
24 changed files with 801 additions and 857 deletions
Download patch file Download diff file Expand all files Collapse all files

20
build/msw/makefile.gcc
View file

@ -1329,7 +1329,8 @@ XRCDLL_OBJECTS = \
$(OBJS)\xrcdll_xh_unkwn.o \
$(OBJS)\xrcdll_xh_wizrd.o \
$(OBJS)\xrcdll_xmlres.o \
$(OBJS)\xrcdll_xmlrsall.o
$(OBJS)\xrcdll_xmlrsall.o \
$(OBJS)\xrcdll_xh_bookctrlbase.o
XRCLIB_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__ \
@ -1407,7 +1408,8 @@ XRCLIB_OBJECTS = \
$(OBJS)\xrclib_xh_unkwn.o \
$(OBJS)\xrclib_xh_wizrd.o \
$(OBJS)\xrclib_xmlres.o \
$(OBJS)\xrclib_xmlrsall.o
$(OBJS)\xrclib_xmlrsall.o \
$(OBJS)\xrclib_xh_bookctrlbase.o
AUIDLL_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__ \
@ -1817,6 +1819,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_xh_wizrd.o \
$(OBJS)\monodll_xmlres.o \
$(OBJS)\monodll_xmlrsall.o \
$(OBJS)\monodll_xh_bookctrlbase.o \
$(OBJS)\monodll_framemanager.o \
$(OBJS)\monodll_dockart.o \
$(OBJS)\monodll_floatpane.o \
@ -2666,6 +2669,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_xh_wizrd.o \
$(OBJS)\monolib_xmlres.o \
$(OBJS)\monolib_xmlrsall.o \
$(OBJS)\monolib_xh_bookctrlbase.o \
$(OBJS)\monolib_framemanager.o \
$(OBJS)\monolib_dockart.o \
$(OBJS)\monolib_floatpane.o \
@ -7962,6 +7966,9 @@ $(OBJS)\monodll_xmlres.o: ../../src/xrc/xmlres.cpp
$(OBJS)\monodll_xmlrsall.o: ../../src/xrc/xmlrsall.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_xh_bookctrlbase.o: ../../src/xrc/xh_bookctrlbase.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_framemanager.o: ../../src/aui/framemanager.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@ -10554,6 +10561,9 @@ $(OBJS)\monolib_xmlres.o: ../../src/xrc/xmlres.cpp
$(OBJS)\monolib_xmlrsall.o: ../../src/xrc/xmlrsall.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_xh_bookctrlbase.o: ../../src/xrc/xh_bookctrlbase.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_framemanager.o: ../../src/aui/framemanager.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@ -16911,6 +16921,9 @@ $(OBJS)\xrcdll_xmlres.o: ../../src/xrc/xmlres.cpp
$(OBJS)\xrcdll_xmlrsall.o: ../../src/xrc/xmlrsall.cpp
$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrcdll_xh_bookctrlbase.o: ../../src/xrc/xh_bookctrlbase.cpp
$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrclib_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
@ -17118,6 +17131,9 @@ $(OBJS)\xrclib_xmlres.o: ../../src/xrc/xmlres.cpp
$(OBJS)\xrclib_xmlrsall.o: ../../src/xrc/xmlrsall.cpp
$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrclib_xh_bookctrlbase.o: ../../src/xrc/xh_bookctrlbase.cpp
$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\auidll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(AUIDLL_CXXFLAGS) $(CPPDEPS) $<