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

Refactor wxXRC to allow defining handlers outside of xrc library.

Browse Source 
Split wxXmlResourceHandler into an ABC and the real implementation to allow
referencing the ABC in the core library itself but without pulling in all of
the XRC into it. This also allows defining XRC handlers, which only depend on
this ABC and not the xrc library, in other libraries, such as richtext, as
demonstrated by the now enabled wxRichTextXMLHandler.

Closes #10996.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-10-23 13:51:32 +00:00
parent 4dca3e02a6
commit a3b9c43bbc
23 changed files with 1169 additions and 469 deletions
Download Patch File Download Diff File Expand all files Collapse all files

176
build/msw/makefile.bcc
View File

@@ -1463,7 +1463,8 @@ RICHTEXTDLL_OBJECTS = \
$(OBJS)\richtextdll_richtextstyledlg.obj \
$(OBJS)\richtextdll_richtextstyles.obj \
$(OBJS)\richtextdll_richtextsymboldlg.obj \
$(OBJS)\richtextdll_richtextxml.obj
$(OBJS)\richtextdll_richtextxml.obj \
$(OBJS)\richtextdll_xh_richtext.obj
RICHTEXTLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
@@ -1484,7 +1485,8 @@ RICHTEXTLIB_OBJECTS = \
$(OBJS)\richtextlib_richtextstyledlg.obj \
$(OBJS)\richtextlib_richtextstyles.obj \
$(OBJS)\richtextlib_richtextsymboldlg.obj \
$(OBJS)\richtextlib_richtextxml.obj
$(OBJS)\richtextlib_richtextxml.obj \
$(OBJS)\richtextlib_xh_richtext.obj
STCDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
@@ -1748,6 +1750,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_richtextstyles.obj \
$(OBJS)\monodll_richtextsymboldlg.obj \
$(OBJS)\monodll_richtextxml.obj \
$(OBJS)\monodll_xh_richtext.obj \
$(OBJS)\monodll_stc.obj \
$(OBJS)\monodll_PlatWX.obj \
$(OBJS)\monodll_ScintillaWX.obj
@@ -1796,7 +1799,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_region.obj \
$(OBJS)\monodll_renderer.obj \
$(OBJS)\monodll_settings.obj \
$(OBJS)\monodll_textmeasure.obj \
$(OBJS)\monodll_textmeasure.obj \
$(OBJS)\monodll_tooltip.obj \
$(OBJS)\monodll_toplevel.obj \
$(OBJS)\monodll_uiaction.obj \
@@ -1982,7 +1985,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_tbarbase.obj \
$(OBJS)\monodll_textcmn.obj \
$(OBJS)\monodll_textentrycmn.obj \
$(OBJS)\monodll_textmeasurecmn.obj \
$(OBJS)\monodll_textmeasurecmn.obj \
$(OBJS)\monodll_toplvcmn.obj \
$(OBJS)\monodll_treebase.obj \
$(OBJS)\monodll_uiactioncmn.obj \
@@ -2027,7 +2030,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_treectlg.obj \
$(OBJS)\monodll_treebkg.obj \
$(OBJS)\monodll_vlbox.obj \
$(OBJS)\monodll_vscroll.obj
$(OBJS)\monodll_vscroll.obj \
$(OBJS)\monodll_xmlreshandler.obj
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
____CORE_SRC_FILENAMES_OBJECTS = \
@@ -2073,7 +2077,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_region.obj \
$(OBJS)\monodll_renderer.obj \
$(OBJS)\monodll_settings.obj \
$(OBJS)\monodll_textmeasure.obj \
$(OBJS)\monodll_textmeasure.obj \
$(OBJS)\monodll_tooltip.obj \
$(OBJS)\monodll_toplevel.obj \
$(OBJS)\monodll_uiaction.obj \
@@ -2253,7 +2257,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_tbarbase.obj \
$(OBJS)\monodll_textcmn.obj \
$(OBJS)\monodll_textentrycmn.obj \
$(OBJS)\monodll_textmeasurecmn.obj \
$(OBJS)\monodll_textmeasurecmn.obj \
$(OBJS)\monodll_toplvcmn.obj \
$(OBJS)\monodll_treebase.obj \
$(OBJS)\monodll_uiactioncmn.obj \
@@ -2298,7 +2302,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_treectlg.obj \
$(OBJS)\monodll_treebkg.obj \
$(OBJS)\monodll_vlbox.obj \
$(OBJS)\monodll_vscroll.obj
$(OBJS)\monodll_vscroll.obj \
$(OBJS)\monodll_xmlreshandler.obj
!endif
!if "$(WXUNIV)" == "0"
____ADVANCED_SRC_FILENAMES_OBJECTS = \
@@ -2543,6 +2548,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_richtextstyles.obj \
$(OBJS)\monolib_richtextsymboldlg.obj \
$(OBJS)\monolib_richtextxml.obj \
$(OBJS)\monolib_xh_richtext.obj \
$(OBJS)\monolib_stc.obj \
$(OBJS)\monolib_PlatWX.obj \
$(OBJS)\monolib_ScintillaWX.obj
@@ -2591,7 +2597,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_region.obj \
$(OBJS)\monolib_renderer.obj \
$(OBJS)\monolib_settings.obj \
$(OBJS)\monolib_textmeasure.obj \
$(OBJS)\monolib_textmeasure.obj \
$(OBJS)\monolib_tooltip.obj \
$(OBJS)\monolib_toplevel.obj \
$(OBJS)\monolib_uiaction.obj \
@@ -2777,7 +2783,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_tbarbase.obj \
$(OBJS)\monolib_textcmn.obj \
$(OBJS)\monolib_textentrycmn.obj \
$(OBJS)\monolib_textmeasurecmn.obj \
$(OBJS)\monolib_textmeasurecmn.obj \
$(OBJS)\monolib_toplvcmn.obj \
$(OBJS)\monolib_treebase.obj \
$(OBJS)\monolib_uiactioncmn.obj \
@@ -2822,7 +2828,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_treectlg.obj \
$(OBJS)\monolib_treebkg.obj \
$(OBJS)\monolib_vlbox.obj \
$(OBJS)\monolib_vscroll.obj
$(OBJS)\monolib_vscroll.obj \
$(OBJS)\monolib_xmlreshandler.obj
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
____CORE_SRC_FILENAMES_1_OBJECTS = \
@@ -2868,7 +2875,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_region.obj \
$(OBJS)\monolib_renderer.obj \
$(OBJS)\monolib_settings.obj \
$(OBJS)\monolib_textmeasure.obj \
$(OBJS)\monolib_textmeasure.obj \
$(OBJS)\monolib_tooltip.obj \
$(OBJS)\monolib_toplevel.obj \
$(OBJS)\monolib_uiaction.obj \
@@ -3048,7 +3055,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_tbarbase.obj \
$(OBJS)\monolib_textcmn.obj \
$(OBJS)\monolib_textentrycmn.obj \
$(OBJS)\monolib_textmeasurecmn.obj \
$(OBJS)\monolib_textmeasurecmn.obj \
$(OBJS)\monolib_toplvcmn.obj \
$(OBJS)\monolib_treebase.obj \
$(OBJS)\monolib_uiactioncmn.obj \
@@ -3093,7 +3100,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_treectlg.obj \
$(OBJS)\monolib_treebkg.obj \
$(OBJS)\monolib_vlbox.obj \
$(OBJS)\monolib_vscroll.obj
$(OBJS)\monolib_vscroll.obj \
$(OBJS)\monolib_xmlreshandler.obj
!endif
!if "$(WXUNIV)" == "0"
____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
@@ -3267,7 +3275,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_region.obj \
$(OBJS)\coredll_renderer.obj \
$(OBJS)\coredll_settings.obj \
$(OBJS)\coredll_textmeasure.obj \
$(OBJS)\coredll_textmeasure.obj \
$(OBJS)\coredll_tooltip.obj \
$(OBJS)\coredll_toplevel.obj \
$(OBJS)\coredll_uiaction.obj \
@@ -3453,7 +3461,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_tbarbase.obj \
$(OBJS)\coredll_textcmn.obj \
$(OBJS)\coredll_textentrycmn.obj \
$(OBJS)\coredll_textmeasurecmn.obj \
$(OBJS)\coredll_textmeasurecmn.obj \
$(OBJS)\coredll_toplvcmn.obj \
$(OBJS)\coredll_treebase.obj \
$(OBJS)\coredll_uiactioncmn.obj \
@@ -3498,7 +3506,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_treectlg.obj \
$(OBJS)\coredll_treebkg.obj \
$(OBJS)\coredll_vlbox.obj \
$(OBJS)\coredll_vscroll.obj
$(OBJS)\coredll_vscroll.obj \
$(OBJS)\coredll_xmlreshandler.obj
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
____CORE_SRC_FILENAMES_2_OBJECTS = \
@@ -3544,7 +3553,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_region.obj \
$(OBJS)\coredll_renderer.obj \
$(OBJS)\coredll_settings.obj \
$(OBJS)\coredll_textmeasure.obj \
$(OBJS)\coredll_textmeasure.obj \
$(OBJS)\coredll_tooltip.obj \
$(OBJS)\coredll_toplevel.obj \
$(OBJS)\coredll_uiaction.obj \
@@ -3724,7 +3733,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_tbarbase.obj \
$(OBJS)\coredll_textcmn.obj \
$(OBJS)\coredll_textentrycmn.obj \
$(OBJS)\coredll_textmeasurecmn.obj \
$(OBJS)\coredll_textmeasurecmn.obj \
$(OBJS)\coredll_toplvcmn.obj \
$(OBJS)\coredll_treebase.obj \
$(OBJS)\coredll_uiactioncmn.obj \
@@ -3769,7 +3778,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_treectlg.obj \
$(OBJS)\coredll_treebkg.obj \
$(OBJS)\coredll_vlbox.obj \
$(OBJS)\coredll_vscroll.obj
$(OBJS)\coredll_vscroll.obj \
$(OBJS)\coredll_xmlreshandler.obj
!endif
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
__corelib___depname = \
@@ -3819,7 +3829,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_region.obj \
$(OBJS)\corelib_renderer.obj \
$(OBJS)\corelib_settings.obj \
$(OBJS)\corelib_textmeasure.obj \
$(OBJS)\corelib_textmeasure.obj \
$(OBJS)\corelib_tooltip.obj \
$(OBJS)\corelib_toplevel.obj \
$(OBJS)\corelib_uiaction.obj \
@@ -4005,7 +4015,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_tbarbase.obj \
$(OBJS)\corelib_textcmn.obj \
$(OBJS)\corelib_textentrycmn.obj \
$(OBJS)\corelib_textmeasurecmn.obj \
$(OBJS)\corelib_textmeasurecmn.obj \
$(OBJS)\corelib_toplvcmn.obj \
$(OBJS)\corelib_treebase.obj \
$(OBJS)\corelib_uiactioncmn.obj \
@@ -4050,7 +4060,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_treectlg.obj \
$(OBJS)\corelib_treebkg.obj \
$(OBJS)\corelib_vlbox.obj \
$(OBJS)\corelib_vscroll.obj
$(OBJS)\corelib_vscroll.obj \
$(OBJS)\corelib_xmlreshandler.obj
!endif
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
____CORE_SRC_FILENAMES_3_OBJECTS = \
@@ -4096,7 +4107,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_region.obj \
$(OBJS)\corelib_renderer.obj \
$(OBJS)\corelib_settings.obj \
$(OBJS)\corelib_textmeasure.obj \
$(OBJS)\corelib_textmeasure.obj \
$(OBJS)\corelib_tooltip.obj \
$(OBJS)\corelib_toplevel.obj \
$(OBJS)\corelib_uiaction.obj \
@@ -4276,7 +4287,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_tbarbase.obj \
$(OBJS)\corelib_textcmn.obj \
$(OBJS)\corelib_textentrycmn.obj \
$(OBJS)\corelib_textmeasurecmn.obj \
$(OBJS)\corelib_textmeasurecmn.obj \
$(OBJS)\corelib_toplvcmn.obj \
$(OBJS)\corelib_treebase.obj \
$(OBJS)\corelib_uiactioncmn.obj \
@@ -4321,7 +4332,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_treectlg.obj \
$(OBJS)\corelib_treebkg.obj \
$(OBJS)\corelib_vlbox.obj \
$(OBJS)\corelib_vscroll.obj
$(OBJS)\corelib_vscroll.obj \
$(OBJS)\corelib_xmlreshandler.obj
!endif
!if "$(SHARED)" == "1"
____wxcore_namedll_DEP = $(__coredll___depname)
@@ -7286,6 +7298,9 @@ $(OBJS)\monodll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
$(OBJS)\monodll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp
$(OBJS)\monodll_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp
$(OBJS)\monodll_stc.obj: ..\..\src\stc\stc.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\stc\stc.cpp
@@ -7512,11 +7527,11 @@ $(OBJS)\monodll_settings.obj: ..\..\src\msw\settings.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_tooltip.obj: ..\..\src\msw\tooltip.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tooltip.cpp
!endif
@@ -8172,11 +8187,11 @@ $(OBJS)\monodll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\toplvcmn.cpp
!endif
@@ -8401,6 +8416,11 @@ $(OBJS)\monodll_vscroll.obj: ..\..\src\generic\vscroll.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\vscroll.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_animatecmn.obj: ..\..\src\common\animatecmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp
@@ -9722,6 +9742,9 @@ $(OBJS)\monolib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp
$(OBJS)\monolib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp
$(OBJS)\monolib_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp
$(OBJS)\monolib_stc.obj: ..\..\src\stc\stc.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\stc\stc.cpp
@@ -9948,11 +9971,11 @@ $(OBJS)\monolib_settings.obj: ..\..\src\msw\settings.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_tooltip.obj: ..\..\src\msw\tooltip.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tooltip.cpp
!endif
@@ -10608,11 +10631,11 @@ $(OBJS)\monolib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\toplvcmn.cpp
!endif
@@ -10837,6 +10860,11 @@ $(OBJS)\monolib_vscroll.obj: ..\..\src\generic\vscroll.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\vscroll.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_animatecmn.obj: ..\..\src\common\animatecmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp
@@ -12348,11 +12376,11 @@ $(OBJS)\coredll_settings.obj: ..\..\src\msw\settings.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_tooltip.obj: ..\..\src\msw\tooltip.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tooltip.cpp
!endif
@@ -13008,11 +13036,11 @@ $(OBJS)\coredll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\toplvcmn.cpp
!endif
@@ -13237,6 +13265,11 @@ $(OBJS)\coredll_vscroll.obj: ..\..\src\generic\vscroll.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\vscroll.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp
!endif
$(OBJS)\corelib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp
@@ -13778,11 +13811,11 @@ $(OBJS)\corelib_settings.obj: ..\..\src\msw\settings.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_tooltip.obj: ..\..\src\msw\tooltip.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tooltip.cpp
!endif
@@ -14438,11 +14471,11 @@ $(OBJS)\corelib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\toplvcmn.cpp
!endif
@@ -14667,6 +14700,11 @@ $(OBJS)\corelib_vscroll.obj: ..\..\src\generic\vscroll.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\vscroll.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp
!endif
$(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
@@ -15855,6 +15893,9 @@ $(OBJS)\richtextdll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.
$(OBJS)\richtextdll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
$(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp
$(OBJS)\richtextdll_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp
$(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp
$(OBJS)\richtextlib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp
@@ -15888,6 +15929,9 @@ $(OBJS)\richtextlib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.
$(OBJS)\richtextlib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp
$(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp
$(OBJS)\richtextlib_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp
$(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp
$(OBJS)\stcdll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp