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.vc
View file

@ -1474,7 +1474,8 @@ XRCDLL_OBJECTS = \
$(OBJS)\xrcdll_xh_unkwn.obj \
$(OBJS)\xrcdll_xh_wizrd.obj \
$(OBJS)\xrcdll_xmlres.obj \
$(OBJS)\xrcdll_xmlrsall.obj
$(OBJS)\xrcdll_xmlrsall.obj \
$(OBJS)\xrcdll_xh_bookctrlbase.obj
XRCDLL_RESOURCES = \
$(OBJS)\xrcdll_version.res
XRCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_441)$(__DEBUGRUNTIME) /DWIN32 \
@ -1559,7 +1560,8 @@ XRCLIB_OBJECTS = \
$(OBJS)\xrclib_xh_unkwn.obj \
$(OBJS)\xrclib_xh_wizrd.obj \
$(OBJS)\xrclib_xmlres.obj \
$(OBJS)\xrclib_xmlrsall.obj
$(OBJS)\xrclib_xmlrsall.obj \
$(OBJS)\xrclib_xh_bookctrlbase.obj
AUIDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_457)$(__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) \
@ -2148,6 +2150,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_xh_wizrd.obj \
$(OBJS)\monodll_xmlres.obj \
$(OBJS)\monodll_xmlrsall.obj \
$(OBJS)\monodll_xh_bookctrlbase.obj \
$(OBJS)\monodll_framemanager.obj \
$(OBJS)\monodll_dockart.obj \
$(OBJS)\monodll_floatpane.obj \
@ -2997,6 +3000,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_xh_wizrd.obj \
$(OBJS)\monolib_xmlres.obj \
$(OBJS)\monolib_xmlrsall.obj \
$(OBJS)\monolib_xh_bookctrlbase.obj \
$(OBJS)\monolib_framemanager.obj \
$(OBJS)\monolib_dockart.obj \
$(OBJS)\monolib_floatpane.obj \
@ -8420,6 +8424,9 @@ $(OBJS)\monodll_xmlres.obj: ..\..\src\xrc\xmlres.cpp
$(OBJS)\monodll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp
$(OBJS)\monodll_xh_bookctrlbase.obj: ..\..\src\xrc\xh_bookctrlbase.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bookctrlbase.cpp
$(OBJS)\monodll_framemanager.obj: ..\..\src\aui\framemanager.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\framemanager.cpp
@ -11012,6 +11019,9 @@ $(OBJS)\monolib_xmlres.obj: ..\..\src\xrc\xmlres.cpp
$(OBJS)\monolib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp
$(OBJS)\monolib_xh_bookctrlbase.obj: ..\..\src\xrc\xh_bookctrlbase.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bookctrlbase.cpp
$(OBJS)\monolib_framemanager.obj: ..\..\src\aui\framemanager.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\framemanager.cpp
@ -17369,6 +17379,9 @@ $(OBJS)\xrcdll_xmlres.obj: ..\..\src\xrc\xmlres.cpp
$(OBJS)\xrcdll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp
$(OBJS)\xrcdll_xh_bookctrlbase.obj: ..\..\src\xrc\xh_bookctrlbase.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bookctrlbase.cpp
$(OBJS)\xrclib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
@ -17576,6 +17589,9 @@ $(OBJS)\xrclib_xmlres.obj: ..\..\src\xrc\xmlres.cpp
$(OBJS)\xrclib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp
$(OBJS)\xrclib_xh_bookctrlbase.obj: ..\..\src\xrc\xh_bookctrlbase.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bookctrlbase.cpp
$(OBJS)\auidll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp