richtextdll_richtextstyledlg.o \
richtextdll_richtextstyles.o \
richtextdll_richtextsymboldlg.o \
- richtextdll_richtextxml.o
+ richtextdll_richtextxml.o \
+ richtextdll_xh_richtext.o
RICHTEXTDLL_ODEP = $(_____pch_wxprec_richtextdll_wx_wxprec_h_gch___depname)
RICHTEXTLIB_CXXFLAGS = $(__richtextlib_PCH_INC) -D__WX$(TOOLKIT)__ \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
richtextlib_richtextstyledlg.o \
richtextlib_richtextstyles.o \
richtextlib_richtextsymboldlg.o \
- richtextlib_richtextxml.o
+ richtextlib_richtextxml.o \
+ richtextlib_xh_richtext.o
RICHTEXTLIB_ODEP = $(_____pch_wxprec_richtextlib_wx_wxprec_h_gch___depname)
STCDLL_CXXFLAGS = $(__stcdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
wx/vscroll.h \
wx/xpmdecod.h \
wx/xpmhand.h \
+ wx/xrc/xmlreshandler.h \
$(LOWLEVEL_HDR) \
$(GUI_CORE_HEADERS) \
$(ADVANCED_HDR) \
wx/richtext/richtexttabspage.h \
wx/richtext/richtextuicustomization.h \
wx/richtext/richtextxml.h \
+ wx/xrc/xh_richtext.h \
wx/stc/stc.h \
$(WEBVIEW_HDR_PLATFORM) \
wx/webview.h \
monodll_richtextstyles.o \
monodll_richtextsymboldlg.o \
monodll_richtextxml.o \
+ monodll_xh_richtext.o \
monodll_stc.o \
monodll_PlatWX.o \
monodll_ScintillaWX.o
monodll_treectlg.o \
monodll_treebkg.o \
monodll_vlbox.o \
- monodll_vscroll.o
+ monodll_vscroll.o \
+ monodll_xmlreshandler.o
@COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS)
COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \
$(__LOWLEVEL_SRC_OBJECTS_1) \
monodll_treectlg.o \
monodll_treebkg.o \
monodll_vlbox.o \
- monodll_vscroll.o
+ monodll_vscroll.o \
+ monodll_xmlreshandler.o
@COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS)
@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS = \
@COND_TOOLKIT_COCOA@ monodll_hid.o monodll_utilsexc_cf.o
monolib_richtextstyles.o \
monolib_richtextsymboldlg.o \
monolib_richtextxml.o \
+ monolib_xh_richtext.o \
monolib_stc.o \
monolib_PlatWX.o \
monolib_ScintillaWX.o
monolib_treectlg.o \
monolib_treebkg.o \
monolib_vlbox.o \
- monolib_vscroll.o
+ monolib_vscroll.o \
+ monolib_xmlreshandler.o
@COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_1 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1)
COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \
$(__LOWLEVEL_SRC_OBJECTS_3) \
monolib_treectlg.o \
monolib_treebkg.o \
monolib_vlbox.o \
- monolib_vscroll.o
+ monolib_vscroll.o \
+ monolib_xmlreshandler.o
@COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_1 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1)
@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_2 = \
@COND_TOOLKIT_COCOA@ monolib_hid.o monolib_utilsexc_cf.o
coredll_treectlg.o \
coredll_treebkg.o \
coredll_vlbox.o \
- coredll_vscroll.o
+ coredll_vscroll.o \
+ coredll_xmlreshandler.o
@COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_2 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2)
COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \
$(__LOWLEVEL_SRC_OBJECTS_5) \
coredll_treectlg.o \
coredll_treebkg.o \
coredll_vlbox.o \
- coredll_vscroll.o
+ coredll_vscroll.o \
+ coredll_xmlreshandler.o
@COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_2 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2)
@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_4 = \
@COND_TOOLKIT_COCOA@ coredll_hid.o coredll_utilsexc_cf.o
corelib_treectlg.o \
corelib_treebkg.o \
corelib_vlbox.o \
- corelib_vscroll.o
+ corelib_vscroll.o \
+ corelib_xmlreshandler.o
@COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_3 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3)
COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \
$(__LOWLEVEL_SRC_OBJECTS_7) \
corelib_treectlg.o \
corelib_treebkg.o \
corelib_vlbox.o \
- corelib_vscroll.o
+ corelib_vscroll.o \
+ corelib_xmlreshandler.o
@COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_3 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3)
@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_6 = \
@COND_TOOLKIT_COCOA@ corelib_hid.o corelib_utilsexc_cf.o
monodll_richtextxml.o: $(srcdir)/src/richtext/richtextxml.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextxml.cpp
+monodll_xh_richtext.o: $(srcdir)/src/xrc/xh_richtext.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_richtext.cpp
+
monodll_stc.o: $(srcdir)/src/stc/stc.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/stc/stc.cpp
@COND_USE_GUI_1@monodll_vscroll.o: $(srcdir)/src/generic/vscroll.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/vscroll.cpp
+@COND_USE_GUI_1@monodll_xmlreshandler.o: $(srcdir)/src/xrc/xmlreshandler.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xmlreshandler.cpp
+
@COND_USE_GUI_1@monodll_animatecmn.o: $(srcdir)/src/common/animatecmn.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/animatecmn.cpp
monolib_richtextxml.o: $(srcdir)/src/richtext/richtextxml.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextxml.cpp
+monolib_xh_richtext.o: $(srcdir)/src/xrc/xh_richtext.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_richtext.cpp
+
monolib_stc.o: $(srcdir)/src/stc/stc.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/stc/stc.cpp
@COND_USE_GUI_1@monolib_vscroll.o: $(srcdir)/src/generic/vscroll.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/vscroll.cpp
+@COND_USE_GUI_1@monolib_xmlreshandler.o: $(srcdir)/src/xrc/xmlreshandler.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xmlreshandler.cpp
+
@COND_USE_GUI_1@monolib_animatecmn.o: $(srcdir)/src/common/animatecmn.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/animatecmn.cpp
@COND_USE_GUI_1@coredll_vscroll.o: $(srcdir)/src/generic/vscroll.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/vscroll.cpp
+@COND_USE_GUI_1@coredll_xmlreshandler.o: $(srcdir)/src/xrc/xmlreshandler.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/xrc/xmlreshandler.cpp
+
corelib_event.o: $(srcdir)/src/common/event.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/event.cpp
@COND_USE_GUI_1@corelib_vscroll.o: $(srcdir)/src/generic/vscroll.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/vscroll.cpp
+@COND_USE_GUI_1@corelib_xmlreshandler.o: $(srcdir)/src/xrc/xmlreshandler.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/xrc/xmlreshandler.cpp
+
advdll_version_rc.o: $(srcdir)/src/msw/version.rc $(ADVDLL_ODEP)
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_ADV
richtextdll_richtextxml.o: $(srcdir)/src/richtext/richtextxml.cpp $(RICHTEXTDLL_ODEP)
$(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextxml.cpp
+richtextdll_xh_richtext.o: $(srcdir)/src/xrc/xh_richtext.cpp $(RICHTEXTDLL_ODEP)
+ $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_richtext.cpp
+
richtextlib_richtextbuffer.o: $(srcdir)/src/richtext/richtextbuffer.cpp $(RICHTEXTLIB_ODEP)
$(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextbuffer.cpp
richtextlib_richtextxml.o: $(srcdir)/src/richtext/richtextxml.cpp $(RICHTEXTLIB_ODEP)
$(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextxml.cpp
+richtextlib_xh_richtext.o: $(srcdir)/src/xrc/xh_richtext.cpp $(RICHTEXTLIB_ODEP)
+ $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_richtext.cpp
+
stcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(STCDLL_ODEP)
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/lexlib --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS --define WXUSINGDLL --define WXMAKINGDLL_STC
src/generic/treebkg.cpp
src/generic/vlbox.cpp
src/generic/vscroll.cpp
+ src/xrc/xmlreshandler.cpp
</set>
<set var="GUI_CMN_HDR" hints="files">
wx/affinematrix2dbase.h
wx/vscroll.h
wx/xpmdecod.h
wx/xpmhand.h
+ wx/xrc/xmlreshandler.h
</set>
<!-- ====================================================================== -->
src/xrc/xh_propdlg.cpp
src/xrc/xh_radbt.cpp
src/xrc/xh_radbx.cpp
- <!-- disabled until linking problems are fixed -->
- <!-- src/xrc/xh_richtext.cpp -->
src/xrc/xh_scrol.cpp
src/xrc/xh_scwin.cpp
src/xrc/xh_htmllbox.cpp
wx/xrc/xh_propdlg.h
wx/xrc/xh_radbt.h
wx/xrc/xh_radbx.h
- <!-- wx/xrc/xh_richtext.h -->
wx/xrc/xh_scrol.h
wx/xrc/xh_scwin.h
wx/xrc/xh_htmllbox.h
src/richtext/richtextstyles.cpp
src/richtext/richtextsymboldlg.cpp
src/richtext/richtextxml.cpp
+ src/xrc/xh_richtext.cpp
</set>
<set var="RICHTEXT_HDR" hints="files">
wx/richtext/richtextbackgroundpage.h
wx/richtext/richtexttabspage.h
wx/richtext/richtextuicustomization.h
wx/richtext/richtextxml.h
+ wx/xrc/xh_richtext.h
</set>
$(OBJS)\richtextdll_richtextstyledlg.obj \\r
$(OBJS)\richtextdll_richtextstyles.obj \\r
$(OBJS)\richtextdll_richtextsymboldlg.obj \\r
- $(OBJS)\richtextdll_richtextxml.obj\r
+ $(OBJS)\richtextdll_richtextxml.obj \\r
+ $(OBJS)\richtextdll_xh_richtext.obj\r
RICHTEXTLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
$(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \\r
$(OBJS)\richtextlib_richtextstyledlg.obj \\r
$(OBJS)\richtextlib_richtextstyles.obj \\r
$(OBJS)\richtextlib_richtextsymboldlg.obj \\r
- $(OBJS)\richtextlib_richtextxml.obj\r
+ $(OBJS)\richtextlib_richtextxml.obj \\r
+ $(OBJS)\richtextlib_xh_richtext.obj\r
STCDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
$(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \\r
$(OBJS)\monodll_richtextstyles.obj \\r
$(OBJS)\monodll_richtextsymboldlg.obj \\r
$(OBJS)\monodll_richtextxml.obj \\r
+ $(OBJS)\monodll_xh_richtext.obj \\r
$(OBJS)\monodll_stc.obj \\r
$(OBJS)\monodll_PlatWX.obj \\r
$(OBJS)\monodll_ScintillaWX.obj\r
$(OBJS)\monodll_region.obj \\r
$(OBJS)\monodll_renderer.obj \\r
$(OBJS)\monodll_settings.obj \\r
- $(OBJS)\monodll_textmeasure.obj \
+ $(OBJS)\monodll_textmeasure.obj \\r
$(OBJS)\monodll_tooltip.obj \\r
$(OBJS)\monodll_toplevel.obj \\r
$(OBJS)\monodll_uiaction.obj \\r
$(OBJS)\monodll_tbarbase.obj \\r
$(OBJS)\monodll_textcmn.obj \\r
$(OBJS)\monodll_textentrycmn.obj \\r
- $(OBJS)\monodll_textmeasurecmn.obj \
+ $(OBJS)\monodll_textmeasurecmn.obj \\r
$(OBJS)\monodll_toplvcmn.obj \\r
$(OBJS)\monodll_treebase.obj \\r
$(OBJS)\monodll_uiactioncmn.obj \\r
$(OBJS)\monodll_treectlg.obj \\r
$(OBJS)\monodll_treebkg.obj \\r
$(OBJS)\monodll_vlbox.obj \\r
- $(OBJS)\monodll_vscroll.obj\r
+ $(OBJS)\monodll_vscroll.obj \\r
+ $(OBJS)\monodll_xmlreshandler.obj\r
!endif\r
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"\r
____CORE_SRC_FILENAMES_OBJECTS = \\r
$(OBJS)\monodll_region.obj \\r
$(OBJS)\monodll_renderer.obj \\r
$(OBJS)\monodll_settings.obj \\r
- $(OBJS)\monodll_textmeasure.obj \
+ $(OBJS)\monodll_textmeasure.obj \\r
$(OBJS)\monodll_tooltip.obj \\r
$(OBJS)\monodll_toplevel.obj \\r
$(OBJS)\monodll_uiaction.obj \\r
$(OBJS)\monodll_tbarbase.obj \\r
$(OBJS)\monodll_textcmn.obj \\r
$(OBJS)\monodll_textentrycmn.obj \\r
- $(OBJS)\monodll_textmeasurecmn.obj \
+ $(OBJS)\monodll_textmeasurecmn.obj \\r
$(OBJS)\monodll_toplvcmn.obj \\r
$(OBJS)\monodll_treebase.obj \\r
$(OBJS)\monodll_uiactioncmn.obj \\r
$(OBJS)\monodll_treectlg.obj \\r
$(OBJS)\monodll_treebkg.obj \\r
$(OBJS)\monodll_vlbox.obj \\r
- $(OBJS)\monodll_vscroll.obj\r
+ $(OBJS)\monodll_vscroll.obj \\r
+ $(OBJS)\monodll_xmlreshandler.obj\r
!endif\r
!if "$(WXUNIV)" == "0"\r
____ADVANCED_SRC_FILENAMES_OBJECTS = \\r
$(OBJS)\monolib_richtextstyles.obj \\r
$(OBJS)\monolib_richtextsymboldlg.obj \\r
$(OBJS)\monolib_richtextxml.obj \\r
+ $(OBJS)\monolib_xh_richtext.obj \\r
$(OBJS)\monolib_stc.obj \\r
$(OBJS)\monolib_PlatWX.obj \\r
$(OBJS)\monolib_ScintillaWX.obj\r
$(OBJS)\monolib_region.obj \\r
$(OBJS)\monolib_renderer.obj \\r
$(OBJS)\monolib_settings.obj \\r
- $(OBJS)\monolib_textmeasure.obj \
+ $(OBJS)\monolib_textmeasure.obj \\r
$(OBJS)\monolib_tooltip.obj \\r
$(OBJS)\monolib_toplevel.obj \\r
$(OBJS)\monolib_uiaction.obj \\r
$(OBJS)\monolib_tbarbase.obj \\r
$(OBJS)\monolib_textcmn.obj \\r
$(OBJS)\monolib_textentrycmn.obj \\r
- $(OBJS)\monolib_textmeasurecmn.obj \
+ $(OBJS)\monolib_textmeasurecmn.obj \\r
$(OBJS)\monolib_toplvcmn.obj \\r
$(OBJS)\monolib_treebase.obj \\r
$(OBJS)\monolib_uiactioncmn.obj \\r
$(OBJS)\monolib_treectlg.obj \\r
$(OBJS)\monolib_treebkg.obj \\r
$(OBJS)\monolib_vlbox.obj \\r
- $(OBJS)\monolib_vscroll.obj\r
+ $(OBJS)\monolib_vscroll.obj \\r
+ $(OBJS)\monolib_xmlreshandler.obj\r
!endif\r
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"\r
____CORE_SRC_FILENAMES_1_OBJECTS = \\r
$(OBJS)\monolib_region.obj \\r
$(OBJS)\monolib_renderer.obj \\r
$(OBJS)\monolib_settings.obj \\r
- $(OBJS)\monolib_textmeasure.obj \
+ $(OBJS)\monolib_textmeasure.obj \\r
$(OBJS)\monolib_tooltip.obj \\r
$(OBJS)\monolib_toplevel.obj \\r
$(OBJS)\monolib_uiaction.obj \\r
$(OBJS)\monolib_tbarbase.obj \\r
$(OBJS)\monolib_textcmn.obj \\r
$(OBJS)\monolib_textentrycmn.obj \\r
- $(OBJS)\monolib_textmeasurecmn.obj \
+ $(OBJS)\monolib_textmeasurecmn.obj \\r
$(OBJS)\monolib_toplvcmn.obj \\r
$(OBJS)\monolib_treebase.obj \\r
$(OBJS)\monolib_uiactioncmn.obj \\r
$(OBJS)\monolib_treectlg.obj \\r
$(OBJS)\monolib_treebkg.obj \\r
$(OBJS)\monolib_vlbox.obj \\r
- $(OBJS)\monolib_vscroll.obj\r
+ $(OBJS)\monolib_vscroll.obj \\r
+ $(OBJS)\monolib_xmlreshandler.obj\r
!endif\r
!if "$(WXUNIV)" == "0"\r
____ADVANCED_SRC_FILENAMES_1_OBJECTS = \\r
$(OBJS)\coredll_region.obj \\r
$(OBJS)\coredll_renderer.obj \\r
$(OBJS)\coredll_settings.obj \\r
- $(OBJS)\coredll_textmeasure.obj \
+ $(OBJS)\coredll_textmeasure.obj \\r
$(OBJS)\coredll_tooltip.obj \\r
$(OBJS)\coredll_toplevel.obj \\r
$(OBJS)\coredll_uiaction.obj \\r
$(OBJS)\coredll_tbarbase.obj \\r
$(OBJS)\coredll_textcmn.obj \\r
$(OBJS)\coredll_textentrycmn.obj \\r
- $(OBJS)\coredll_textmeasurecmn.obj \
+ $(OBJS)\coredll_textmeasurecmn.obj \\r
$(OBJS)\coredll_toplvcmn.obj \\r
$(OBJS)\coredll_treebase.obj \\r
$(OBJS)\coredll_uiactioncmn.obj \\r
$(OBJS)\coredll_treectlg.obj \\r
$(OBJS)\coredll_treebkg.obj \\r
$(OBJS)\coredll_vlbox.obj \\r
- $(OBJS)\coredll_vscroll.obj\r
+ $(OBJS)\coredll_vscroll.obj \\r
+ $(OBJS)\coredll_xmlreshandler.obj\r
!endif\r
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"\r
____CORE_SRC_FILENAMES_2_OBJECTS = \\r
$(OBJS)\coredll_region.obj \\r
$(OBJS)\coredll_renderer.obj \\r
$(OBJS)\coredll_settings.obj \\r
- $(OBJS)\coredll_textmeasure.obj \
+ $(OBJS)\coredll_textmeasure.obj \\r
$(OBJS)\coredll_tooltip.obj \\r
$(OBJS)\coredll_toplevel.obj \\r
$(OBJS)\coredll_uiaction.obj \\r
$(OBJS)\coredll_tbarbase.obj \\r
$(OBJS)\coredll_textcmn.obj \\r
$(OBJS)\coredll_textentrycmn.obj \\r
- $(OBJS)\coredll_textmeasurecmn.obj \
+ $(OBJS)\coredll_textmeasurecmn.obj \\r
$(OBJS)\coredll_toplvcmn.obj \\r
$(OBJS)\coredll_treebase.obj \\r
$(OBJS)\coredll_uiactioncmn.obj \\r
$(OBJS)\coredll_treectlg.obj \\r
$(OBJS)\coredll_treebkg.obj \\r
$(OBJS)\coredll_vlbox.obj \\r
- $(OBJS)\coredll_vscroll.obj\r
+ $(OBJS)\coredll_vscroll.obj \\r
+ $(OBJS)\coredll_xmlreshandler.obj\r
!endif\r
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"\r
__corelib___depname = \\r
$(OBJS)\corelib_region.obj \\r
$(OBJS)\corelib_renderer.obj \\r
$(OBJS)\corelib_settings.obj \\r
- $(OBJS)\corelib_textmeasure.obj \
+ $(OBJS)\corelib_textmeasure.obj \\r
$(OBJS)\corelib_tooltip.obj \\r
$(OBJS)\corelib_toplevel.obj \\r
$(OBJS)\corelib_uiaction.obj \\r
$(OBJS)\corelib_tbarbase.obj \\r
$(OBJS)\corelib_textcmn.obj \\r
$(OBJS)\corelib_textentrycmn.obj \\r
- $(OBJS)\corelib_textmeasurecmn.obj \
+ $(OBJS)\corelib_textmeasurecmn.obj \\r
$(OBJS)\corelib_toplvcmn.obj \\r
$(OBJS)\corelib_treebase.obj \\r
$(OBJS)\corelib_uiactioncmn.obj \\r
$(OBJS)\corelib_treectlg.obj \\r
$(OBJS)\corelib_treebkg.obj \\r
$(OBJS)\corelib_vlbox.obj \\r
- $(OBJS)\corelib_vscroll.obj\r
+ $(OBJS)\corelib_vscroll.obj \\r
+ $(OBJS)\corelib_xmlreshandler.obj\r
!endif\r
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"\r
____CORE_SRC_FILENAMES_3_OBJECTS = \\r
$(OBJS)\corelib_region.obj \\r
$(OBJS)\corelib_renderer.obj \\r
$(OBJS)\corelib_settings.obj \\r
- $(OBJS)\corelib_textmeasure.obj \
+ $(OBJS)\corelib_textmeasure.obj \\r
$(OBJS)\corelib_tooltip.obj \\r
$(OBJS)\corelib_toplevel.obj \\r
$(OBJS)\corelib_uiaction.obj \\r
$(OBJS)\corelib_tbarbase.obj \\r
$(OBJS)\corelib_textcmn.obj \\r
$(OBJS)\corelib_textentrycmn.obj \\r
- $(OBJS)\corelib_textmeasurecmn.obj \
+ $(OBJS)\corelib_textmeasurecmn.obj \\r
$(OBJS)\corelib_toplvcmn.obj \\r
$(OBJS)\corelib_treebase.obj \\r
$(OBJS)\corelib_uiactioncmn.obj \\r
$(OBJS)\corelib_treectlg.obj \\r
$(OBJS)\corelib_treebkg.obj \\r
$(OBJS)\corelib_vlbox.obj \\r
- $(OBJS)\corelib_vscroll.obj\r
+ $(OBJS)\corelib_vscroll.obj \\r
+ $(OBJS)\corelib_xmlreshandler.obj\r
!endif\r
!if "$(SHARED)" == "1"\r
____wxcore_namedll_DEP = $(__coredll___depname)\r
$(OBJS)\monodll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp\r
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp\r
\r
+$(OBJS)\monodll_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp\r
+ $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp\r
+\r
$(OBJS)\monodll_stc.obj: ..\..\src\stc\stc.cpp\r
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\stc\stc.cpp\r
\r
!endif\r
\r
!if "$(USE_GUI)" == "1"\r
-$(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\r
+ $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
$(OBJS)\monodll_tooltip.obj: ..\..\src\msw\tooltip.cpp\r
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tooltip.cpp\r
!endif\r
!endif\r
\r
!if "$(USE_GUI)" == "1"\r
-$(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\r
+ $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
$(OBJS)\monodll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp\r
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\toplvcmn.cpp\r
!endif\r
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\vscroll.cpp\r
!endif\r
\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp\r
+ $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp\r
+!endif\r
+\r
!if "$(USE_GUI)" == "1"\r
$(OBJS)\monodll_animatecmn.obj: ..\..\src\common\animatecmn.cpp\r
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp\r
$(OBJS)\monolib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp\r
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp\r
\r
+$(OBJS)\monolib_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp\r
+ $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp\r
+\r
$(OBJS)\monolib_stc.obj: ..\..\src\stc\stc.cpp\r
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\stc\stc.cpp\r
\r
!endif\r
\r
!if "$(USE_GUI)" == "1"\r
-$(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\r
+ $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
$(OBJS)\monolib_tooltip.obj: ..\..\src\msw\tooltip.cpp\r
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tooltip.cpp\r
!endif\r
!endif\r
\r
!if "$(USE_GUI)" == "1"\r
-$(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\r
+ $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
$(OBJS)\monolib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp\r
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\toplvcmn.cpp\r
!endif\r
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\vscroll.cpp\r
!endif\r
\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp\r
+ $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp\r
+!endif\r
+\r
!if "$(USE_GUI)" == "1"\r
$(OBJS)\monolib_animatecmn.obj: ..\..\src\common\animatecmn.cpp\r
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp\r
!endif\r
\r
!if "$(USE_GUI)" == "1"\r
-$(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\r
+ $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
$(OBJS)\coredll_tooltip.obj: ..\..\src\msw\tooltip.cpp\r
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tooltip.cpp\r
!endif\r
!endif\r
\r
!if "$(USE_GUI)" == "1"\r
-$(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\r
+ $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
$(OBJS)\coredll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp\r
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\toplvcmn.cpp\r
!endif\r
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\vscroll.cpp\r
!endif\r
\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp\r
+ $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp\r
+!endif\r
+\r
$(OBJS)\corelib_dummy.obj: ..\..\src\common\dummy.cpp\r
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp\r
\r
!endif\r
\r
!if "$(USE_GUI)" == "1"\r
-$(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\r
+ $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
$(OBJS)\corelib_tooltip.obj: ..\..\src\msw\tooltip.cpp\r
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tooltip.cpp\r
!endif\r
!endif\r
\r
!if "$(USE_GUI)" == "1"\r
-$(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\r
+ $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
$(OBJS)\corelib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp\r
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\toplvcmn.cpp\r
!endif\r
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\vscroll.cpp\r
!endif\r
\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp\r
+ $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp\r
+!endif\r
+\r
$(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp\r
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp\r
\r
$(OBJS)\richtextdll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp\r
$(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp\r
\r
+$(OBJS)\richtextdll_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp\r
+ $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp\r
+\r
$(OBJS)\richtextlib_dummy.obj: ..\..\src\common\dummy.cpp\r
$(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp\r
\r
$(OBJS)\richtextlib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp\r
$(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp\r
\r
+$(OBJS)\richtextlib_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp\r
+ $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp\r
+\r
$(OBJS)\stcdll_dummy.obj: ..\..\src\common\dummy.cpp\r
$(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp\r
\r
$(OBJS)\richtextdll_richtextstyledlg.o \\r
$(OBJS)\richtextdll_richtextstyles.o \\r
$(OBJS)\richtextdll_richtextsymboldlg.o \\r
- $(OBJS)\richtextdll_richtextxml.o\r
+ $(OBJS)\richtextdll_richtextxml.o \\r
+ $(OBJS)\richtextdll_xh_richtext.o\r
RICHTEXTLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \\r
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \\r
$(OBJS)\richtextlib_richtextstyledlg.o \\r
$(OBJS)\richtextlib_richtextstyles.o \\r
$(OBJS)\richtextlib_richtextsymboldlg.o \\r
- $(OBJS)\richtextlib_richtextxml.o\r
+ $(OBJS)\richtextlib_richtextxml.o \\r
+ $(OBJS)\richtextlib_xh_richtext.o\r
STCDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \\r
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
$(OBJS)\monodll_richtextstyles.o \\r
$(OBJS)\monodll_richtextsymboldlg.o \\r
$(OBJS)\monodll_richtextxml.o \\r
+ $(OBJS)\monodll_xh_richtext.o \\r
$(OBJS)\monodll_stc.o \\r
$(OBJS)\monodll_PlatWX.o \\r
$(OBJS)\monodll_ScintillaWX.o\r
$(OBJS)\monodll_region.o \\r
$(OBJS)\monodll_renderer.o \\r
$(OBJS)\monodll_settings.o \\r
- $(OBJS)\monodll_textmeasure.o \
+ $(OBJS)\monodll_textmeasure.o \\r
$(OBJS)\monodll_tooltip.o \\r
$(OBJS)\monodll_toplevel.o \\r
$(OBJS)\monodll_uiaction.o \\r
$(OBJS)\monodll_tbarbase.o \\r
$(OBJS)\monodll_textcmn.o \\r
$(OBJS)\monodll_textentrycmn.o \\r
- $(OBJS)\monodll_textmeasurecmn.o \
+ $(OBJS)\monodll_textmeasurecmn.o \\r
$(OBJS)\monodll_toplvcmn.o \\r
$(OBJS)\monodll_treebase.o \\r
$(OBJS)\monodll_uiactioncmn.o \\r
$(OBJS)\monodll_treectlg.o \\r
$(OBJS)\monodll_treebkg.o \\r
$(OBJS)\monodll_vlbox.o \\r
- $(OBJS)\monodll_vscroll.o\r
+ $(OBJS)\monodll_vscroll.o \\r
+ $(OBJS)\monodll_xmlreshandler.o\r
endif\r
endif\r
ifeq ($(USE_GUI),1)\r
$(OBJS)\monodll_region.o \\r
$(OBJS)\monodll_renderer.o \\r
$(OBJS)\monodll_settings.o \\r
- $(OBJS)\monodll_textmeasure.o \
+ $(OBJS)\monodll_textmeasure.o \\r
$(OBJS)\monodll_tooltip.o \\r
$(OBJS)\monodll_toplevel.o \\r
$(OBJS)\monodll_uiaction.o \\r
$(OBJS)\monodll_tbarbase.o \\r
$(OBJS)\monodll_textcmn.o \\r
$(OBJS)\monodll_textentrycmn.o \\r
- $(OBJS)\monodll_textmeasurecmn.o \
+ $(OBJS)\monodll_textmeasurecmn.o \\r
$(OBJS)\monodll_toplvcmn.o \\r
$(OBJS)\monodll_treebase.o \\r
$(OBJS)\monodll_uiactioncmn.o \\r
$(OBJS)\monodll_treectlg.o \\r
$(OBJS)\monodll_treebkg.o \\r
$(OBJS)\monodll_vlbox.o \\r
- $(OBJS)\monodll_vscroll.o\r
+ $(OBJS)\monodll_vscroll.o \\r
+ $(OBJS)\monodll_xmlreshandler.o\r
endif\r
endif\r
ifeq ($(WXUNIV),0)\r
$(OBJS)\monolib_richtextstyles.o \\r
$(OBJS)\monolib_richtextsymboldlg.o \\r
$(OBJS)\monolib_richtextxml.o \\r
+ $(OBJS)\monolib_xh_richtext.o \\r
$(OBJS)\monolib_stc.o \\r
$(OBJS)\monolib_PlatWX.o \\r
$(OBJS)\monolib_ScintillaWX.o\r
$(OBJS)\monolib_region.o \\r
$(OBJS)\monolib_renderer.o \\r
$(OBJS)\monolib_settings.o \\r
- $(OBJS)\monolib_textmeasure.o \
+ $(OBJS)\monolib_textmeasure.o \\r
$(OBJS)\monolib_tooltip.o \\r
$(OBJS)\monolib_toplevel.o \\r
$(OBJS)\monolib_uiaction.o \\r
$(OBJS)\monolib_tbarbase.o \\r
$(OBJS)\monolib_textcmn.o \\r
$(OBJS)\monolib_textentrycmn.o \\r
- $(OBJS)\monolib_textmeasurecmn.o \
+ $(OBJS)\monolib_textmeasurecmn.o \\r
$(OBJS)\monolib_toplvcmn.o \\r
$(OBJS)\monolib_treebase.o \\r
$(OBJS)\monolib_uiactioncmn.o \\r
$(OBJS)\monolib_treectlg.o \\r
$(OBJS)\monolib_treebkg.o \\r
$(OBJS)\monolib_vlbox.o \\r
- $(OBJS)\monolib_vscroll.o\r
+ $(OBJS)\monolib_vscroll.o \\r
+ $(OBJS)\monolib_xmlreshandler.o\r
endif\r
endif\r
ifeq ($(USE_GUI),1)\r
$(OBJS)\monolib_region.o \\r
$(OBJS)\monolib_renderer.o \\r
$(OBJS)\monolib_settings.o \\r
- $(OBJS)\monolib_textmeasure.o \
+ $(OBJS)\monolib_textmeasure.o \\r
$(OBJS)\monolib_tooltip.o \\r
$(OBJS)\monolib_toplevel.o \\r
$(OBJS)\monolib_uiaction.o \\r
$(OBJS)\monolib_tbarbase.o \\r
$(OBJS)\monolib_textcmn.o \\r
$(OBJS)\monolib_textentrycmn.o \\r
- $(OBJS)\monolib_textmeasurecmn.o \
+ $(OBJS)\monolib_textmeasurecmn.o \\r
$(OBJS)\monolib_toplvcmn.o \\r
$(OBJS)\monolib_treebase.o \\r
$(OBJS)\monolib_uiactioncmn.o \\r
$(OBJS)\monolib_treectlg.o \\r
$(OBJS)\monolib_treebkg.o \\r
$(OBJS)\monolib_vlbox.o \\r
- $(OBJS)\monolib_vscroll.o\r
+ $(OBJS)\monolib_vscroll.o \\r
+ $(OBJS)\monolib_xmlreshandler.o\r
endif\r
endif\r
ifeq ($(WXUNIV),0)\r
$(OBJS)\coredll_region.o \\r
$(OBJS)\coredll_renderer.o \\r
$(OBJS)\coredll_settings.o \\r
- $(OBJS)\coredll_textmeasure.o \
+ $(OBJS)\coredll_textmeasure.o \\r
$(OBJS)\coredll_tooltip.o \\r
$(OBJS)\coredll_toplevel.o \\r
$(OBJS)\coredll_uiaction.o \\r
$(OBJS)\coredll_tbarbase.o \\r
$(OBJS)\coredll_textcmn.o \\r
$(OBJS)\coredll_textentrycmn.o \\r
- $(OBJS)\coredll_textmeasurecmn.o \
+ $(OBJS)\coredll_textmeasurecmn.o \\r
$(OBJS)\coredll_toplvcmn.o \\r
$(OBJS)\coredll_treebase.o \\r
$(OBJS)\coredll_uiactioncmn.o \\r
$(OBJS)\coredll_treectlg.o \\r
$(OBJS)\coredll_treebkg.o \\r
$(OBJS)\coredll_vlbox.o \\r
- $(OBJS)\coredll_vscroll.o\r
+ $(OBJS)\coredll_vscroll.o \\r
+ $(OBJS)\coredll_xmlreshandler.o\r
endif\r
endif\r
ifeq ($(USE_GUI),1)\r
$(OBJS)\coredll_region.o \\r
$(OBJS)\coredll_renderer.o \\r
$(OBJS)\coredll_settings.o \\r
- $(OBJS)\coredll_textmeasure.o \
+ $(OBJS)\coredll_textmeasure.o \\r
$(OBJS)\coredll_tooltip.o \\r
$(OBJS)\coredll_toplevel.o \\r
$(OBJS)\coredll_uiaction.o \\r
$(OBJS)\coredll_tbarbase.o \\r
$(OBJS)\coredll_textcmn.o \\r
$(OBJS)\coredll_textentrycmn.o \\r
- $(OBJS)\coredll_textmeasurecmn.o \
+ $(OBJS)\coredll_textmeasurecmn.o \\r
$(OBJS)\coredll_toplvcmn.o \\r
$(OBJS)\coredll_treebase.o \\r
$(OBJS)\coredll_uiactioncmn.o \\r
$(OBJS)\coredll_treectlg.o \\r
$(OBJS)\coredll_treebkg.o \\r
$(OBJS)\coredll_vlbox.o \\r
- $(OBJS)\coredll_vscroll.o\r
+ $(OBJS)\coredll_vscroll.o \\r
+ $(OBJS)\coredll_xmlreshandler.o\r
endif\r
endif\r
ifeq ($(MONOLITHIC),0)\r
$(OBJS)\corelib_region.o \\r
$(OBJS)\corelib_renderer.o \\r
$(OBJS)\corelib_settings.o \\r
- $(OBJS)\corelib_textmeasure.o \
+ $(OBJS)\corelib_textmeasure.o \\r
$(OBJS)\corelib_tooltip.o \\r
$(OBJS)\corelib_toplevel.o \\r
$(OBJS)\corelib_uiaction.o \\r
$(OBJS)\corelib_tbarbase.o \\r
$(OBJS)\corelib_textcmn.o \\r
$(OBJS)\corelib_textentrycmn.o \\r
- $(OBJS)\corelib_textmeasurecmn.o \
+ $(OBJS)\corelib_textmeasurecmn.o \\r
$(OBJS)\corelib_toplvcmn.o \\r
$(OBJS)\corelib_treebase.o \\r
$(OBJS)\corelib_uiactioncmn.o \\r
$(OBJS)\corelib_treectlg.o \\r
$(OBJS)\corelib_treebkg.o \\r
$(OBJS)\corelib_vlbox.o \\r
- $(OBJS)\corelib_vscroll.o\r
+ $(OBJS)\corelib_vscroll.o \\r
+ $(OBJS)\corelib_xmlreshandler.o\r
endif\r
endif\r
ifeq ($(USE_GUI),1)\r
$(OBJS)\corelib_region.o \\r
$(OBJS)\corelib_renderer.o \\r
$(OBJS)\corelib_settings.o \\r
- $(OBJS)\corelib_textmeasure.o \
+ $(OBJS)\corelib_textmeasure.o \\r
$(OBJS)\corelib_tooltip.o \\r
$(OBJS)\corelib_toplevel.o \\r
$(OBJS)\corelib_uiaction.o \\r
$(OBJS)\corelib_tbarbase.o \\r
$(OBJS)\corelib_textcmn.o \\r
$(OBJS)\corelib_textentrycmn.o \\r
- $(OBJS)\corelib_textmeasurecmn.o \
+ $(OBJS)\corelib_textmeasurecmn.o \\r
$(OBJS)\corelib_toplvcmn.o \\r
$(OBJS)\corelib_treebase.o \\r
$(OBJS)\corelib_uiactioncmn.o \\r
$(OBJS)\corelib_treectlg.o \\r
$(OBJS)\corelib_treebkg.o \\r
$(OBJS)\corelib_vlbox.o \\r
- $(OBJS)\corelib_vscroll.o\r
+ $(OBJS)\corelib_vscroll.o \\r
+ $(OBJS)\corelib_xmlreshandler.o\r
endif\r
endif\r
ifeq ($(SHARED),1)\r
$(OBJS)\monodll_richtextxml.o: ../../src/richtext/richtextxml.cpp\r
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
\r
+$(OBJS)\monodll_xh_richtext.o: ../../src/xrc/xh_richtext.cpp\r
+ $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
$(OBJS)\monodll_stc.o: ../../src/stc/stc.cpp\r
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
\r
endif\r
\r
ifeq ($(USE_GUI),1)\r
-$(OBJS)\monodll_textmeasure.o: ../../src/msw/textmeasure.cpp
- $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_textmeasure.o: ../../src/msw/textmeasure.cpp\r
+ $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
$(OBJS)\monodll_tooltip.o: ../../src/msw/tooltip.cpp\r
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
endif\r
endif\r
\r
ifeq ($(USE_GUI),1)\r
-$(OBJS)\monodll_textmeasurecmn.o: ../../src/common/textmeasurecmn.cpp
- $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_textmeasurecmn.o: ../../src/common/textmeasurecmn.cpp\r
+ $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
$(OBJS)\monodll_toplvcmn.o: ../../src/common/toplvcmn.cpp\r
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
endif\r
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
endif\r
\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_xmlreshandler.o: ../../src/xrc/xmlreshandler.cpp\r
+ $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
ifeq ($(USE_GUI),1)\r
$(OBJS)\monodll_animatecmn.o: ../../src/common/animatecmn.cpp\r
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
$(OBJS)\monolib_richtextxml.o: ../../src/richtext/richtextxml.cpp\r
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
\r
+$(OBJS)\monolib_xh_richtext.o: ../../src/xrc/xh_richtext.cpp\r
+ $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
$(OBJS)\monolib_stc.o: ../../src/stc/stc.cpp\r
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
\r
endif\r
\r
ifeq ($(USE_GUI),1)\r
-$(OBJS)\monolib_textmeasure.o: ../../src/msw/textmeasure.cpp
- $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_textmeasure.o: ../../src/msw/textmeasure.cpp\r
+ $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
$(OBJS)\monolib_tooltip.o: ../../src/msw/tooltip.cpp\r
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
endif\r
endif\r
\r
ifeq ($(USE_GUI),1)\r
-$(OBJS)\monolib_textmeasurecmn.o: ../../src/common/textmeasurecmn.cpp
- $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_textmeasurecmn.o: ../../src/common/textmeasurecmn.cpp\r
+ $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
$(OBJS)\monolib_toplvcmn.o: ../../src/common/toplvcmn.cpp\r
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
endif\r
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
endif\r
\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_xmlreshandler.o: ../../src/xrc/xmlreshandler.cpp\r
+ $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
ifeq ($(USE_GUI),1)\r
$(OBJS)\monolib_animatecmn.o: ../../src/common/animatecmn.cpp\r
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
endif\r
\r
ifeq ($(USE_GUI),1)\r
-$(OBJS)\coredll_textmeasure.o: ../../src/msw/textmeasure.cpp
- $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
+$(OBJS)\coredll_textmeasure.o: ../../src/msw/textmeasure.cpp\r
+ $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
$(OBJS)\coredll_tooltip.o: ../../src/msw/tooltip.cpp\r
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
endif\r
endif\r
\r
ifeq ($(USE_GUI),1)\r
-$(OBJS)\coredll_textmeasurecmn.o: ../../src/common/textmeasurecmn.cpp
- $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
+$(OBJS)\coredll_textmeasurecmn.o: ../../src/common/textmeasurecmn.cpp\r
+ $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
$(OBJS)\coredll_toplvcmn.o: ../../src/common/toplvcmn.cpp\r
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
endif\r
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
endif\r
\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\coredll_xmlreshandler.o: ../../src/xrc/xmlreshandler.cpp\r
+ $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
$(OBJS)\corelib_dummy.o: ../../src/common/dummy.cpp\r
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
\r
endif\r
\r
ifeq ($(USE_GUI),1)\r
-$(OBJS)\corelib_textmeasure.o: ../../src/msw/textmeasure.cpp
- $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
+$(OBJS)\corelib_textmeasure.o: ../../src/msw/textmeasure.cpp\r
+ $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
$(OBJS)\corelib_tooltip.o: ../../src/msw/tooltip.cpp\r
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
endif\r
endif\r
\r
ifeq ($(USE_GUI),1)\r
-$(OBJS)\corelib_textmeasurecmn.o: ../../src/common/textmeasurecmn.cpp
- $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
+$(OBJS)\corelib_textmeasurecmn.o: ../../src/common/textmeasurecmn.cpp\r
+ $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
$(OBJS)\corelib_toplvcmn.o: ../../src/common/toplvcmn.cpp\r
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
endif\r
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
endif\r
\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\corelib_xmlreshandler.o: ../../src/xrc/xmlreshandler.cpp\r
+ $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
$(OBJS)\advdll_dummy.o: ../../src/common/dummy.cpp\r
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
\r
$(OBJS)\richtextdll_richtextxml.o: ../../src/richtext/richtextxml.cpp\r
$(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $<\r
\r
+$(OBJS)\richtextdll_xh_richtext.o: ../../src/xrc/xh_richtext.cpp\r
+ $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
$(OBJS)\richtextlib_dummy.o: ../../src/common/dummy.cpp\r
$(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $<\r
\r
$(OBJS)\richtextlib_richtextxml.o: ../../src/richtext/richtextxml.cpp\r
$(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $<\r
\r
+$(OBJS)\richtextlib_xh_richtext.o: ../../src/xrc/xh_richtext.cpp\r
+ $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
$(OBJS)\stcdll_dummy.o: ../../src/common/dummy.cpp\r
$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $(CPPDEPS) $<\r
\r
$(OBJS)\richtextdll_richtextstyledlg.obj \\r
$(OBJS)\richtextdll_richtextstyles.obj \\r
$(OBJS)\richtextdll_richtextsymboldlg.obj \\r
- $(OBJS)\richtextdll_richtextxml.obj\r
+ $(OBJS)\richtextdll_richtextxml.obj \\r
+ $(OBJS)\richtextdll_xh_richtext.obj\r
RICHTEXTDLL_RESOURCES = \\r
$(OBJS)\richtextdll_version.res\r
RICHTEXTLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_565)$(__DEBUGRUNTIME) /DWIN32 \\r
$(OBJS)\richtextlib_richtextstyledlg.obj \\r
$(OBJS)\richtextlib_richtextstyles.obj \\r
$(OBJS)\richtextlib_richtextsymboldlg.obj \\r
- $(OBJS)\richtextlib_richtextxml.obj\r
+ $(OBJS)\richtextlib_richtextxml.obj \\r
+ $(OBJS)\richtextlib_xh_richtext.obj\r
STCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_581)$(__DEBUGRUNTIME) /DWIN32 \\r
$(__DEBUGINFO) \\r
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).pdb \\r
$(OBJS)\monodll_richtextstyles.obj \\r
$(OBJS)\monodll_richtextsymboldlg.obj \\r
$(OBJS)\monodll_richtextxml.obj \\r
+ $(OBJS)\monodll_xh_richtext.obj \\r
$(OBJS)\monodll_stc.obj \\r
$(OBJS)\monodll_PlatWX.obj \\r
$(OBJS)\monodll_ScintillaWX.obj\r
$(OBJS)\monodll_region.obj \\r
$(OBJS)\monodll_renderer.obj \\r
$(OBJS)\monodll_settings.obj \\r
- $(OBJS)\monodll_textmeasure.obj \
+ $(OBJS)\monodll_textmeasure.obj \\r
$(OBJS)\monodll_tooltip.obj \\r
$(OBJS)\monodll_toplevel.obj \\r
$(OBJS)\monodll_uiaction.obj \\r
$(OBJS)\monodll_tbarbase.obj \\r
$(OBJS)\monodll_textcmn.obj \\r
$(OBJS)\monodll_textentrycmn.obj \\r
- $(OBJS)\monodll_textmeasurecmn.obj \
+ $(OBJS)\monodll_textmeasurecmn.obj \\r
$(OBJS)\monodll_toplvcmn.obj \\r
$(OBJS)\monodll_treebase.obj \\r
$(OBJS)\monodll_uiactioncmn.obj \\r
$(OBJS)\monodll_treectlg.obj \\r
$(OBJS)\monodll_treebkg.obj \\r
$(OBJS)\monodll_vlbox.obj \\r
- $(OBJS)\monodll_vscroll.obj\r
+ $(OBJS)\monodll_vscroll.obj \\r
+ $(OBJS)\monodll_xmlreshandler.obj\r
!endif\r
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"\r
____CORE_SRC_FILENAMES_OBJECTS = \\r
$(OBJS)\monodll_region.obj \\r
$(OBJS)\monodll_renderer.obj \\r
$(OBJS)\monodll_settings.obj \\r
- $(OBJS)\monodll_textmeasure.obj \
+ $(OBJS)\monodll_textmeasure.obj \\r
$(OBJS)\monodll_tooltip.obj \\r
$(OBJS)\monodll_toplevel.obj \\r
$(OBJS)\monodll_uiaction.obj \\r
$(OBJS)\monodll_tbarbase.obj \\r
$(OBJS)\monodll_textcmn.obj \\r
$(OBJS)\monodll_textentrycmn.obj \\r
- $(OBJS)\monodll_textmeasurecmn.obj \
+ $(OBJS)\monodll_textmeasurecmn.obj \\r
$(OBJS)\monodll_toplvcmn.obj \\r
$(OBJS)\monodll_treebase.obj \\r
$(OBJS)\monodll_uiactioncmn.obj \\r
$(OBJS)\monodll_treectlg.obj \\r
$(OBJS)\monodll_treebkg.obj \\r
$(OBJS)\monodll_vlbox.obj \\r
- $(OBJS)\monodll_vscroll.obj\r
+ $(OBJS)\monodll_vscroll.obj \\r
+ $(OBJS)\monodll_xmlreshandler.obj\r
!endif\r
!if "$(WXUNIV)" == "0"\r
____ADVANCED_SRC_FILENAMES_OBJECTS = \\r
$(OBJS)\monolib_richtextstyles.obj \\r
$(OBJS)\monolib_richtextsymboldlg.obj \\r
$(OBJS)\monolib_richtextxml.obj \\r
+ $(OBJS)\monolib_xh_richtext.obj \\r
$(OBJS)\monolib_stc.obj \\r
$(OBJS)\monolib_PlatWX.obj \\r
$(OBJS)\monolib_ScintillaWX.obj\r
$(OBJS)\monolib_region.obj \\r
$(OBJS)\monolib_renderer.obj \\r
$(OBJS)\monolib_settings.obj \\r
- $(OBJS)\monolib_textmeasure.obj \
+ $(OBJS)\monolib_textmeasure.obj \\r
$(OBJS)\monolib_tooltip.obj \\r
$(OBJS)\monolib_toplevel.obj \\r
$(OBJS)\monolib_uiaction.obj \\r
$(OBJS)\monolib_tbarbase.obj \\r
$(OBJS)\monolib_textcmn.obj \\r
$(OBJS)\monolib_textentrycmn.obj \\r
- $(OBJS)\monolib_textmeasurecmn.obj \
+ $(OBJS)\monolib_textmeasurecmn.obj \\r
$(OBJS)\monolib_toplvcmn.obj \\r
$(OBJS)\monolib_treebase.obj \\r
$(OBJS)\monolib_uiactioncmn.obj \\r
$(OBJS)\monolib_treectlg.obj \\r
$(OBJS)\monolib_treebkg.obj \\r
$(OBJS)\monolib_vlbox.obj \\r
- $(OBJS)\monolib_vscroll.obj\r
+ $(OBJS)\monolib_vscroll.obj \\r
+ $(OBJS)\monolib_xmlreshandler.obj\r
!endif\r
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"\r
____CORE_SRC_FILENAMES_1_OBJECTS = \\r
$(OBJS)\monolib_region.obj \\r
$(OBJS)\monolib_renderer.obj \\r
$(OBJS)\monolib_settings.obj \\r
- $(OBJS)\monolib_textmeasure.obj \
+ $(OBJS)\monolib_textmeasure.obj \\r
$(OBJS)\monolib_tooltip.obj \\r
$(OBJS)\monolib_toplevel.obj \\r
$(OBJS)\monolib_uiaction.obj \\r
$(OBJS)\monolib_tbarbase.obj \\r
$(OBJS)\monolib_textcmn.obj \\r
$(OBJS)\monolib_textentrycmn.obj \\r
- $(OBJS)\monolib_textmeasurecmn.obj \
+ $(OBJS)\monolib_textmeasurecmn.obj \\r
$(OBJS)\monolib_toplvcmn.obj \\r
$(OBJS)\monolib_treebase.obj \\r
$(OBJS)\monolib_uiactioncmn.obj \\r
$(OBJS)\monolib_treectlg.obj \\r
$(OBJS)\monolib_treebkg.obj \\r
$(OBJS)\monolib_vlbox.obj \\r
- $(OBJS)\monolib_vscroll.obj\r
+ $(OBJS)\monolib_vscroll.obj \\r
+ $(OBJS)\monolib_xmlreshandler.obj\r
!endif\r
!if "$(WXUNIV)" == "0"\r
____ADVANCED_SRC_FILENAMES_1_OBJECTS = \\r
$(OBJS)\coredll_region.obj \\r
$(OBJS)\coredll_renderer.obj \\r
$(OBJS)\coredll_settings.obj \\r
- $(OBJS)\coredll_textmeasure.obj \
+ $(OBJS)\coredll_textmeasure.obj \\r
$(OBJS)\coredll_tooltip.obj \\r
$(OBJS)\coredll_toplevel.obj \\r
$(OBJS)\coredll_uiaction.obj \\r
$(OBJS)\coredll_tbarbase.obj \\r
$(OBJS)\coredll_textcmn.obj \\r
$(OBJS)\coredll_textentrycmn.obj \\r
- $(OBJS)\coredll_textmeasurecmn.obj \
+ $(OBJS)\coredll_textmeasurecmn.obj \\r
$(OBJS)\coredll_toplvcmn.obj \\r
$(OBJS)\coredll_treebase.obj \\r
$(OBJS)\coredll_uiactioncmn.obj \\r
$(OBJS)\coredll_treectlg.obj \\r
$(OBJS)\coredll_treebkg.obj \\r
$(OBJS)\coredll_vlbox.obj \\r
- $(OBJS)\coredll_vscroll.obj\r
+ $(OBJS)\coredll_vscroll.obj \\r
+ $(OBJS)\coredll_xmlreshandler.obj\r
!endif\r
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"\r
____CORE_SRC_FILENAMES_2_OBJECTS = \\r
$(OBJS)\coredll_region.obj \\r
$(OBJS)\coredll_renderer.obj \\r
$(OBJS)\coredll_settings.obj \\r
- $(OBJS)\coredll_textmeasure.obj \
+ $(OBJS)\coredll_textmeasure.obj \\r
$(OBJS)\coredll_tooltip.obj \\r
$(OBJS)\coredll_toplevel.obj \\r
$(OBJS)\coredll_uiaction.obj \\r
$(OBJS)\coredll_tbarbase.obj \\r
$(OBJS)\coredll_textcmn.obj \\r
$(OBJS)\coredll_textentrycmn.obj \\r
- $(OBJS)\coredll_textmeasurecmn.obj \
+ $(OBJS)\coredll_textmeasurecmn.obj \\r
$(OBJS)\coredll_toplvcmn.obj \\r
$(OBJS)\coredll_treebase.obj \\r
$(OBJS)\coredll_uiactioncmn.obj \\r
$(OBJS)\coredll_treectlg.obj \\r
$(OBJS)\coredll_treebkg.obj \\r
$(OBJS)\coredll_vlbox.obj \\r
- $(OBJS)\coredll_vscroll.obj\r
+ $(OBJS)\coredll_vscroll.obj \\r
+ $(OBJS)\coredll_xmlreshandler.obj\r
!endif\r
!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"\r
__corelib___depname = \\r
$(OBJS)\corelib_region.obj \\r
$(OBJS)\corelib_renderer.obj \\r
$(OBJS)\corelib_settings.obj \\r
- $(OBJS)\corelib_textmeasure.obj \
+ $(OBJS)\corelib_textmeasure.obj \\r
$(OBJS)\corelib_tooltip.obj \\r
$(OBJS)\corelib_toplevel.obj \\r
$(OBJS)\corelib_uiaction.obj \\r
$(OBJS)\corelib_tbarbase.obj \\r
$(OBJS)\corelib_textcmn.obj \\r
$(OBJS)\corelib_textentrycmn.obj \\r
- $(OBJS)\corelib_textmeasurecmn.obj \
+ $(OBJS)\corelib_textmeasurecmn.obj \\r
$(OBJS)\corelib_toplvcmn.obj \\r
$(OBJS)\corelib_treebase.obj \\r
$(OBJS)\corelib_uiactioncmn.obj \\r
$(OBJS)\corelib_treectlg.obj \\r
$(OBJS)\corelib_treebkg.obj \\r
$(OBJS)\corelib_vlbox.obj \\r
- $(OBJS)\corelib_vscroll.obj\r
+ $(OBJS)\corelib_vscroll.obj \\r
+ $(OBJS)\corelib_xmlreshandler.obj\r
!endif\r
!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"\r
____CORE_SRC_FILENAMES_3_OBJECTS = \\r
$(OBJS)\corelib_region.obj \\r
$(OBJS)\corelib_renderer.obj \\r
$(OBJS)\corelib_settings.obj \\r
- $(OBJS)\corelib_textmeasure.obj \
+ $(OBJS)\corelib_textmeasure.obj \\r
$(OBJS)\corelib_tooltip.obj \\r
$(OBJS)\corelib_toplevel.obj \\r
$(OBJS)\corelib_uiaction.obj \\r
$(OBJS)\corelib_tbarbase.obj \\r
$(OBJS)\corelib_textcmn.obj \\r
$(OBJS)\corelib_textentrycmn.obj \\r
- $(OBJS)\corelib_textmeasurecmn.obj \
+ $(OBJS)\corelib_textmeasurecmn.obj \\r
$(OBJS)\corelib_toplvcmn.obj \\r
$(OBJS)\corelib_treebase.obj \\r
$(OBJS)\corelib_uiactioncmn.obj \\r
$(OBJS)\corelib_treectlg.obj \\r
$(OBJS)\corelib_treebkg.obj \\r
$(OBJS)\corelib_vlbox.obj \\r
- $(OBJS)\corelib_vscroll.obj\r
+ $(OBJS)\corelib_vscroll.obj \\r
+ $(OBJS)\corelib_xmlreshandler.obj\r
!endif\r
!if "$(SHARED)" == "1"\r
____wxcore_namedll_DEP = $(__coredll___depname)\r
$(OBJS)\monodll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp\r
\r
+$(OBJS)\monodll_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp\r
+\r
$(OBJS)\monodll_stc.obj: ..\..\src\stc\stc.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\stc\stc.cpp\r
\r
!endif\r
\r
!if "$(USE_GUI)" == "1"\r
-$(OBJS)\monodll_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_textmeasure.obj: ..\..\src\msw\textmeasure.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
$(OBJS)\monodll_tooltip.obj: ..\..\src\msw\tooltip.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tooltip.cpp\r
!endif\r
!endif\r
\r
!if "$(USE_GUI)" == "1"\r
-$(OBJS)\monodll_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
$(OBJS)\monodll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\toplvcmn.cpp\r
!endif\r
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\vscroll.cpp\r
!endif\r
\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp\r
+!endif\r
+\r
!if "$(USE_GUI)" == "1"\r
$(OBJS)\monodll_animatecmn.obj: ..\..\src\common\animatecmn.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp\r
$(OBJS)\monolib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp\r
\r
+$(OBJS)\monolib_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp\r
+\r
$(OBJS)\monolib_stc.obj: ..\..\src\stc\stc.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\stc\stc.cpp\r
\r
!endif\r
\r
!if "$(USE_GUI)" == "1"\r
-$(OBJS)\monolib_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_textmeasure.obj: ..\..\src\msw\textmeasure.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
$(OBJS)\monolib_tooltip.obj: ..\..\src\msw\tooltip.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tooltip.cpp\r
!endif\r
!endif\r
\r
!if "$(USE_GUI)" == "1"\r
-$(OBJS)\monolib_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
$(OBJS)\monolib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\toplvcmn.cpp\r
!endif\r
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\vscroll.cpp\r
!endif\r
\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp\r
+!endif\r
+\r
!if "$(USE_GUI)" == "1"\r
$(OBJS)\monolib_animatecmn.obj: ..\..\src\common\animatecmn.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp\r
!endif\r
\r
!if "$(USE_GUI)" == "1"\r
-$(OBJS)\coredll_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_textmeasure.obj: ..\..\src\msw\textmeasure.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
$(OBJS)\coredll_tooltip.obj: ..\..\src\msw\tooltip.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tooltip.cpp\r
!endif\r
!endif\r
\r
!if "$(USE_GUI)" == "1"\r
-$(OBJS)\coredll_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
$(OBJS)\coredll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\toplvcmn.cpp\r
!endif\r
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\vscroll.cpp\r
!endif\r
\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp\r
+!endif\r
+\r
$(OBJS)\corelib_dummy.obj: ..\..\src\common\dummy.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
\r
!endif\r
\r
!if "$(USE_GUI)" == "1"\r
-$(OBJS)\corelib_textmeasure.obj: ..\..\src\msw\textmeasure.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_textmeasure.obj: ..\..\src\msw\textmeasure.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
$(OBJS)\corelib_tooltip.obj: ..\..\src\msw\tooltip.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tooltip.cpp\r
!endif\r
!endif\r
\r
!if "$(USE_GUI)" == "1"\r
-$(OBJS)\corelib_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
$(OBJS)\corelib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\toplvcmn.cpp\r
!endif\r
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\vscroll.cpp\r
!endif\r
\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp\r
+!endif\r
+\r
$(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
\r
$(OBJS)\richtextdll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp\r
\r
+$(OBJS)\richtextdll_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp\r
+\r
$(OBJS)\richtextlib_dummy.obj: ..\..\src\common\dummy.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
\r
$(OBJS)\richtextlib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp\r
\r
+$(OBJS)\richtextlib_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp\r
+ $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp\r
+\r
$(OBJS)\stcdll_dummy.obj: ..\..\src\common\dummy.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
\r
$(OBJS)\monodll_richtextstyles.obj &\r
$(OBJS)\monodll_richtextsymboldlg.obj &\r
$(OBJS)\monodll_richtextxml.obj &\r
+ $(OBJS)\monodll_xh_richtext.obj &\r
$(OBJS)\monodll_stc.obj &\r
$(OBJS)\monodll_PlatWX.obj &\r
$(OBJS)\monodll_ScintillaWX.obj\r
$(OBJS)\monodll_region.obj &\r
$(OBJS)\monodll_renderer.obj &\r
$(OBJS)\monodll_settings.obj &\r
- $(OBJS)\monodll_textmeasure.obj &
+ $(OBJS)\monodll_textmeasure.obj &\r
$(OBJS)\monodll_tooltip.obj &\r
$(OBJS)\monodll_toplevel.obj &\r
$(OBJS)\monodll_uiaction.obj &\r
$(OBJS)\monodll_tbarbase.obj &\r
$(OBJS)\monodll_textcmn.obj &\r
$(OBJS)\monodll_textentrycmn.obj &\r
- $(OBJS)\monodll_textmeasurecmn.obj &
+ $(OBJS)\monodll_textmeasurecmn.obj &\r
$(OBJS)\monodll_toplvcmn.obj &\r
$(OBJS)\monodll_treebase.obj &\r
$(OBJS)\monodll_uiactioncmn.obj &\r
$(OBJS)\monodll_treectlg.obj &\r
$(OBJS)\monodll_treebkg.obj &\r
$(OBJS)\monodll_vlbox.obj &\r
- $(OBJS)\monodll_vscroll.obj\r
+ $(OBJS)\monodll_vscroll.obj &\r
+ $(OBJS)\monodll_xmlreshandler.obj\r
!endif\r
!endif\r
!ifeq USE_GUI 1\r
$(OBJS)\monodll_region.obj &\r
$(OBJS)\monodll_renderer.obj &\r
$(OBJS)\monodll_settings.obj &\r
- $(OBJS)\monodll_textmeasure.obj &
+ $(OBJS)\monodll_textmeasure.obj &\r
$(OBJS)\monodll_tooltip.obj &\r
$(OBJS)\monodll_toplevel.obj &\r
$(OBJS)\monodll_uiaction.obj &\r
$(OBJS)\monodll_tbarbase.obj &\r
$(OBJS)\monodll_textcmn.obj &\r
$(OBJS)\monodll_textentrycmn.obj &\r
- $(OBJS)\monodll_textmeasurecmn.obj &
+ $(OBJS)\monodll_textmeasurecmn.obj &\r
$(OBJS)\monodll_toplvcmn.obj &\r
$(OBJS)\monodll_treebase.obj &\r
$(OBJS)\monodll_uiactioncmn.obj &\r
$(OBJS)\monodll_treectlg.obj &\r
$(OBJS)\monodll_treebkg.obj &\r
$(OBJS)\monodll_vlbox.obj &\r
- $(OBJS)\monodll_vscroll.obj\r
+ $(OBJS)\monodll_vscroll.obj &\r
+ $(OBJS)\monodll_xmlreshandler.obj\r
!endif\r
!endif\r
____ADVANCED_SRC_FILENAMES_OBJECTS =\r
$(OBJS)\monolib_richtextstyles.obj &\r
$(OBJS)\monolib_richtextsymboldlg.obj &\r
$(OBJS)\monolib_richtextxml.obj &\r
+ $(OBJS)\monolib_xh_richtext.obj &\r
$(OBJS)\monolib_stc.obj &\r
$(OBJS)\monolib_PlatWX.obj &\r
$(OBJS)\monolib_ScintillaWX.obj\r
$(OBJS)\monolib_region.obj &\r
$(OBJS)\monolib_renderer.obj &\r
$(OBJS)\monolib_settings.obj &\r
- $(OBJS)\monolib_textmeasure.obj &
+ $(OBJS)\monolib_textmeasure.obj &\r
$(OBJS)\monolib_tooltip.obj &\r
$(OBJS)\monolib_toplevel.obj &\r
$(OBJS)\monolib_uiaction.obj &\r
$(OBJS)\monolib_tbarbase.obj &\r
$(OBJS)\monolib_textcmn.obj &\r
$(OBJS)\monolib_textentrycmn.obj &\r
- $(OBJS)\monolib_textmeasurecmn.obj &
+ $(OBJS)\monolib_textmeasurecmn.obj &\r
$(OBJS)\monolib_toplvcmn.obj &\r
$(OBJS)\monolib_treebase.obj &\r
$(OBJS)\monolib_uiactioncmn.obj &\r
$(OBJS)\monolib_treectlg.obj &\r
$(OBJS)\monolib_treebkg.obj &\r
$(OBJS)\monolib_vlbox.obj &\r
- $(OBJS)\monolib_vscroll.obj\r
+ $(OBJS)\monolib_vscroll.obj &\r
+ $(OBJS)\monolib_xmlreshandler.obj\r
!endif\r
!endif\r
!ifeq USE_GUI 1\r
$(OBJS)\monolib_region.obj &\r
$(OBJS)\monolib_renderer.obj &\r
$(OBJS)\monolib_settings.obj &\r
- $(OBJS)\monolib_textmeasure.obj &
+ $(OBJS)\monolib_textmeasure.obj &\r
$(OBJS)\monolib_tooltip.obj &\r
$(OBJS)\monolib_toplevel.obj &\r
$(OBJS)\monolib_uiaction.obj &\r
$(OBJS)\monolib_tbarbase.obj &\r
$(OBJS)\monolib_textcmn.obj &\r
$(OBJS)\monolib_textentrycmn.obj &\r
- $(OBJS)\monolib_textmeasurecmn.obj &
+ $(OBJS)\monolib_textmeasurecmn.obj &\r
$(OBJS)\monolib_toplvcmn.obj &\r
$(OBJS)\monolib_treebase.obj &\r
$(OBJS)\monolib_uiactioncmn.obj &\r
$(OBJS)\monolib_treectlg.obj &\r
$(OBJS)\monolib_treebkg.obj &\r
$(OBJS)\monolib_vlbox.obj &\r
- $(OBJS)\monolib_vscroll.obj\r
+ $(OBJS)\monolib_vscroll.obj &\r
+ $(OBJS)\monolib_xmlreshandler.obj\r
!endif\r
!endif\r
____ADVANCED_SRC_FILENAMES_1_OBJECTS =\r
$(OBJS)\coredll_region.obj &\r
$(OBJS)\coredll_renderer.obj &\r
$(OBJS)\coredll_settings.obj &\r
- $(OBJS)\coredll_textmeasure.obj &
+ $(OBJS)\coredll_textmeasure.obj &\r
$(OBJS)\coredll_tooltip.obj &\r
$(OBJS)\coredll_toplevel.obj &\r
$(OBJS)\coredll_uiaction.obj &\r
$(OBJS)\coredll_tbarbase.obj &\r
$(OBJS)\coredll_textcmn.obj &\r
$(OBJS)\coredll_textentrycmn.obj &\r
- $(OBJS)\coredll_textmeasurecmn.obj &
+ $(OBJS)\coredll_textmeasurecmn.obj &\r
$(OBJS)\coredll_toplvcmn.obj &\r
$(OBJS)\coredll_treebase.obj &\r
$(OBJS)\coredll_uiactioncmn.obj &\r
$(OBJS)\coredll_treectlg.obj &\r
$(OBJS)\coredll_treebkg.obj &\r
$(OBJS)\coredll_vlbox.obj &\r
- $(OBJS)\coredll_vscroll.obj\r
+ $(OBJS)\coredll_vscroll.obj &\r
+ $(OBJS)\coredll_xmlreshandler.obj\r
!endif\r
!endif\r
!ifeq USE_GUI 1\r
$(OBJS)\coredll_region.obj &\r
$(OBJS)\coredll_renderer.obj &\r
$(OBJS)\coredll_settings.obj &\r
- $(OBJS)\coredll_textmeasure.obj &
+ $(OBJS)\coredll_textmeasure.obj &\r
$(OBJS)\coredll_tooltip.obj &\r
$(OBJS)\coredll_toplevel.obj &\r
$(OBJS)\coredll_uiaction.obj &\r
$(OBJS)\coredll_tbarbase.obj &\r
$(OBJS)\coredll_textcmn.obj &\r
$(OBJS)\coredll_textentrycmn.obj &\r
- $(OBJS)\coredll_textmeasurecmn.obj &
+ $(OBJS)\coredll_textmeasurecmn.obj &\r
$(OBJS)\coredll_toplvcmn.obj &\r
$(OBJS)\coredll_treebase.obj &\r
$(OBJS)\coredll_uiactioncmn.obj &\r
$(OBJS)\coredll_treectlg.obj &\r
$(OBJS)\coredll_treebkg.obj &\r
$(OBJS)\coredll_vlbox.obj &\r
- $(OBJS)\coredll_vscroll.obj\r
+ $(OBJS)\coredll_vscroll.obj &\r
+ $(OBJS)\coredll_xmlreshandler.obj\r
!endif\r
!endif\r
__corelib___depname =\r
$(OBJS)\corelib_region.obj &\r
$(OBJS)\corelib_renderer.obj &\r
$(OBJS)\corelib_settings.obj &\r
- $(OBJS)\corelib_textmeasure.obj &
+ $(OBJS)\corelib_textmeasure.obj &\r
$(OBJS)\corelib_tooltip.obj &\r
$(OBJS)\corelib_toplevel.obj &\r
$(OBJS)\corelib_uiaction.obj &\r
$(OBJS)\corelib_tbarbase.obj &\r
$(OBJS)\corelib_textcmn.obj &\r
$(OBJS)\corelib_textentrycmn.obj &\r
- $(OBJS)\corelib_textmeasurecmn.obj &
+ $(OBJS)\corelib_textmeasurecmn.obj &\r
$(OBJS)\corelib_toplvcmn.obj &\r
$(OBJS)\corelib_treebase.obj &\r
$(OBJS)\corelib_uiactioncmn.obj &\r
$(OBJS)\corelib_treectlg.obj &\r
$(OBJS)\corelib_treebkg.obj &\r
$(OBJS)\corelib_vlbox.obj &\r
- $(OBJS)\corelib_vscroll.obj\r
+ $(OBJS)\corelib_vscroll.obj &\r
+ $(OBJS)\corelib_xmlreshandler.obj\r
!endif\r
!endif\r
!ifeq USE_GUI 1\r
$(OBJS)\corelib_region.obj &\r
$(OBJS)\corelib_renderer.obj &\r
$(OBJS)\corelib_settings.obj &\r
- $(OBJS)\corelib_textmeasure.obj &
+ $(OBJS)\corelib_textmeasure.obj &\r
$(OBJS)\corelib_tooltip.obj &\r
$(OBJS)\corelib_toplevel.obj &\r
$(OBJS)\corelib_uiaction.obj &\r
$(OBJS)\corelib_tbarbase.obj &\r
$(OBJS)\corelib_textcmn.obj &\r
$(OBJS)\corelib_textentrycmn.obj &\r
- $(OBJS)\corelib_textmeasurecmn.obj &
+ $(OBJS)\corelib_textmeasurecmn.obj &\r
$(OBJS)\corelib_toplvcmn.obj &\r
$(OBJS)\corelib_treebase.obj &\r
$(OBJS)\corelib_uiactioncmn.obj &\r
$(OBJS)\corelib_treectlg.obj &\r
$(OBJS)\corelib_treebkg.obj &\r
$(OBJS)\corelib_vlbox.obj &\r
- $(OBJS)\corelib_vscroll.obj\r
+ $(OBJS)\corelib_vscroll.obj &\r
+ $(OBJS)\corelib_xmlreshandler.obj\r
!endif\r
!endif\r
____wxcore_namedll_DEP =\r
$(OBJS)\richtextdll_richtextstyledlg.obj &\r
$(OBJS)\richtextdll_richtextstyles.obj &\r
$(OBJS)\richtextdll_richtextsymboldlg.obj &\r
- $(OBJS)\richtextdll_richtextxml.obj\r
+ $(OBJS)\richtextdll_richtextxml.obj &\r
+ $(OBJS)\richtextdll_xh_richtext.obj\r
RICHTEXTLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &\r
$(OBJS)\richtextlib_richtextstyledlg.obj &\r
$(OBJS)\richtextlib_richtextstyles.obj &\r
$(OBJS)\richtextlib_richtextsymboldlg.obj &\r
- $(OBJS)\richtextlib_richtextxml.obj\r
+ $(OBJS)\richtextlib_richtextxml.obj &\r
+ $(OBJS)\richtextlib_xh_richtext.obj\r
STCDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &\r
$(OBJS)\monodll_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
\r
+$(OBJS)\monodll_xh_richtext.obj : .AUTODEPEND ..\..\src\xrc\xh_richtext.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+\r
$(OBJS)\monodll_stc.obj : .AUTODEPEND ..\..\src\stc\stc.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
\r
!endif\r
\r
!ifeq USE_GUI 1\r
-$(OBJS)\monodll_textmeasure.obj : .AUTODEPEND ..\..\src\msw\textmeasure.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
+$(OBJS)\monodll_textmeasure.obj : .AUTODEPEND ..\..\src\msw\textmeasure.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
$(OBJS)\monodll_tooltip.obj : .AUTODEPEND ..\..\src\msw\tooltip.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
!endif\r
!endif\r
\r
!ifeq USE_GUI 1\r
-$(OBJS)\monodll_textmeasurecmn.obj : .AUTODEPEND ..\..\src\common\textmeasurecmn.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
+$(OBJS)\monodll_textmeasurecmn.obj : .AUTODEPEND ..\..\src\common\textmeasurecmn.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
$(OBJS)\monodll_toplvcmn.obj : .AUTODEPEND ..\..\src\common\toplvcmn.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
!endif\r
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
!endif\r
\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_xmlreshandler.obj : .AUTODEPEND ..\..\src\xrc\xmlreshandler.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
!ifeq USE_GUI 1\r
$(OBJS)\monodll_animatecmn.obj : .AUTODEPEND ..\..\src\common\animatecmn.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
$(OBJS)\monolib_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
\r
+$(OBJS)\monolib_xh_richtext.obj : .AUTODEPEND ..\..\src\xrc\xh_richtext.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+\r
$(OBJS)\monolib_stc.obj : .AUTODEPEND ..\..\src\stc\stc.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
\r
!endif\r
\r
!ifeq USE_GUI 1\r
-$(OBJS)\monolib_textmeasure.obj : .AUTODEPEND ..\..\src\msw\textmeasure.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
+$(OBJS)\monolib_textmeasure.obj : .AUTODEPEND ..\..\src\msw\textmeasure.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
$(OBJS)\monolib_tooltip.obj : .AUTODEPEND ..\..\src\msw\tooltip.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
!endif\r
!endif\r
\r
!ifeq USE_GUI 1\r
-$(OBJS)\monolib_textmeasurecmn.obj : .AUTODEPEND ..\..\src\common\textmeasurecmn.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
+$(OBJS)\monolib_textmeasurecmn.obj : .AUTODEPEND ..\..\src\common\textmeasurecmn.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
$(OBJS)\monolib_toplvcmn.obj : .AUTODEPEND ..\..\src\common\toplvcmn.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
!endif\r
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
!endif\r
\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_xmlreshandler.obj : .AUTODEPEND ..\..\src\xrc\xmlreshandler.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
!ifeq USE_GUI 1\r
$(OBJS)\monolib_animatecmn.obj : .AUTODEPEND ..\..\src\common\animatecmn.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
!endif\r
\r
!ifeq USE_GUI 1\r
-$(OBJS)\coredll_textmeasure.obj : .AUTODEPEND ..\..\src\msw\textmeasure.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
+$(OBJS)\coredll_textmeasure.obj : .AUTODEPEND ..\..\src\msw\textmeasure.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
$(OBJS)\coredll_tooltip.obj : .AUTODEPEND ..\..\src\msw\tooltip.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
!endif\r
!endif\r
\r
!ifeq USE_GUI 1\r
-$(OBJS)\coredll_textmeasurecmn.obj : .AUTODEPEND ..\..\src\common\textmeasurecmn.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
+$(OBJS)\coredll_textmeasurecmn.obj : .AUTODEPEND ..\..\src\common\textmeasurecmn.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
$(OBJS)\coredll_toplvcmn.obj : .AUTODEPEND ..\..\src\common\toplvcmn.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
!endif\r
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
!endif\r
\r
+!ifeq USE_GUI 1\r
+$(OBJS)\coredll_xmlreshandler.obj : .AUTODEPEND ..\..\src\xrc\xmlreshandler.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
+!endif\r
+\r
$(OBJS)\corelib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
\r
!endif\r
\r
!ifeq USE_GUI 1\r
-$(OBJS)\corelib_textmeasure.obj : .AUTODEPEND ..\..\src\msw\textmeasure.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
+$(OBJS)\corelib_textmeasure.obj : .AUTODEPEND ..\..\src\msw\textmeasure.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
$(OBJS)\corelib_tooltip.obj : .AUTODEPEND ..\..\src\msw\tooltip.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
!endif\r
!endif\r
\r
!ifeq USE_GUI 1\r
-$(OBJS)\corelib_textmeasurecmn.obj : .AUTODEPEND ..\..\src\common\textmeasurecmn.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
+$(OBJS)\corelib_textmeasurecmn.obj : .AUTODEPEND ..\..\src\common\textmeasurecmn.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
$(OBJS)\corelib_toplvcmn.obj : .AUTODEPEND ..\..\src\common\toplvcmn.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
!endif\r
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
!endif\r
\r
+!ifeq USE_GUI 1\r
+$(OBJS)\corelib_xmlreshandler.obj : .AUTODEPEND ..\..\src\xrc\xmlreshandler.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
+!endif\r
+\r
$(OBJS)\advdll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
\r
$(OBJS)\richtextdll_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<\r
\r
+$(OBJS)\richtextdll_xh_richtext.obj : .AUTODEPEND ..\..\src\xrc\xh_richtext.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $<\r
+\r
$(OBJS)\richtextlib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<\r
\r
$(OBJS)\richtextlib_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<\r
\r
+$(OBJS)\richtextlib_xh_richtext.obj : .AUTODEPEND ..\..\src\xrc\xh_richtext.cpp\r
+ $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $<\r
+\r
$(OBJS)\stcdll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<\r
\r
# End Source File\r
# Begin Source File\r
\r
-SOURCE=..\..\src\common\textmeasurecmn.cpp
-# End Source File
-# Begin Source File
-
+SOURCE=..\..\src\common\textmeasurecmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
SOURCE=..\..\src\common\toplvcmn.cpp\r
# End Source File\r
# Begin Source File\r
# End Source File\r
# Begin Source File\r
\r
-SOURCE=..\..\src\msw\textmeasure.cpp
-# End Source File
-# Begin Source File
-
+SOURCE=..\..\src\msw\textmeasure.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
SOURCE=..\..\src\msw\tglbtn.cpp\r
\r
!IF "$(CFG)" == "core - Win32 DLL Universal Release"\r
# End Source File\r
# Begin Source File\r
\r
+SOURCE=..\..\include\wx\xrc\xh_richtext.h\r
+# End Source File\r
+# Begin Source File\r
+\r
SOURCE=..\..\include\wx\xrc\xh_scrol.h\r
# End Source File\r
# Begin Source File\r
# End Source File\r
# Begin Source File\r
\r
+SOURCE=..\..\include\wx\xrc\xmlreshandler.h\r
+# End Source File\r
+# Begin Source File\r
+\r
SOURCE=..\..\include\wx\xpmdecod.h\r
# End Source File\r
# Begin Source File\r
SOURCE=..\..\include\wx\xpmhand.h\r
# End Source File\r
# End Group\r
+# Begin Group "Source Files"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\xrc\xmlreshandler.cpp\r
+# End Source File\r
+# End Group\r
# End Target\r
# End Project\r
\r
\r
SOURCE=..\..\include\wx\richtext\richtextxml.h\r
# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\xrc\xh_richtext.h\r
+# End Source File\r
# End Group\r
# Begin Group "Source Files"\r
\r
\r
SOURCE=..\..\src\richtext\richtextxml.cpp\r
# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\xrc\xh_richtext.cpp\r
+# End Source File\r
# End Group\r
# End Target\r
# End Project\r
<File\r
RelativePath="..\..\include\wx\xrc\xh_radbx.h">\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\xrc\xh_richtext.h">\r
+ </File>\r
<File\r
RelativePath="..\..\include\wx\xrc\xh_scrol.h">\r
</File>\r
<File\r
RelativePath="..\..\include\wx\xrc\xmlres.h">\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\xrc\xmlreshandler.h">\r
+ </File>\r
<File\r
RelativePath="..\..\include\wx\xpmdecod.h">\r
</File>\r
RelativePath="..\..\include\wx\xpmhand.h">\r
</File>\r
</Filter>\r
+ <Filter\r
+ Name="Source Files"\r
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">\r
+ <File\r
+ RelativePath="..\..\src\xrc\xmlreshandler.cpp">\r
+ </File>\r
+ </Filter>\r
</Files>\r
<Globals>\r
\r
<File\r
RelativePath="..\..\include\wx\richtext\richtextxml.h">\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\xrc\xh_richtext.h">\r
+ </File>\r
</Filter>\r
<Filter\r
Name="Source Files"\r
<File\r
RelativePath="..\..\src\richtext\richtextxml.cpp">\r
</File>\r
+ <File\r
+ RelativePath="..\..\src\xrc\xh_richtext.cpp">\r
+ </File>\r
</Filter>\r
</Files>\r
<Globals>\r
RelativePath="..\..\include\wx\xrc\xh_radbx.h"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\xrc\xh_richtext.h"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\..\include\wx\xrc\xh_scrol.h"\r
>\r
RelativePath="..\..\include\wx\xrc\xmlres.h"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\xrc\xmlreshandler.h"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\..\include\wx\xpmdecod.h"\r
>\r
>\r
</File>\r
</Filter>\r
+ <Filter\r
+ Name="Source Files"\r
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+ >\r
+ <File\r
+ RelativePath="..\..\src\xrc\xmlreshandler.cpp"\r
+ >\r
+ </File>\r
+ </Filter>\r
</Files>\r
<Globals>\r
\r
RelativePath="..\..\include\wx\richtext\richtextxml.h"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\xrc\xh_richtext.h"\r
+ >\r
+ </File>\r
</Filter>\r
<Filter\r
Name="Source Files"\r
RelativePath="..\..\src\richtext\richtextxml.cpp"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\src\xrc\xh_richtext.cpp"\r
+ >\r
+ </File>\r
</Filter>\r
</Files>\r
<Globals>\r
RelativePath="..\..\include\wx\xrc\xh_radbx.h"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\xrc\xh_richtext.h"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\..\include\wx\xrc\xh_scrol.h"\r
>\r
RelativePath="..\..\include\wx\xrc\xmlres.h"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\xrc\xmlreshandler.h"\r
+ >\r
+ </File>\r
<File\r
RelativePath="..\..\include\wx\xpmdecod.h"\r
>\r
>\r
</File>\r
</Filter>\r
+ <Filter\r
+ Name="Source Files"\r
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+ >\r
+ <File\r
+ RelativePath="..\..\src\xrc\xmlreshandler.cpp"\r
+ >\r
+ </File>\r
+ </Filter>\r
</Files>\r
<Globals>\r
\r
RelativePath="..\..\include\wx\richtext\richtextxml.h"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\include\wx\xrc\xh_richtext.h"\r
+ >\r
+ </File>\r
</Filter>\r
<Filter\r
Name="Source Files"\r
RelativePath="..\..\src\richtext\richtextxml.cpp"\r
>\r
</File>\r
+ <File\r
+ RelativePath="..\..\src\xrc\xh_richtext.cpp"\r
+ >\r
+ </File>\r
</Filter>\r
</Files>\r
<Globals>\r
Maximum length of the text entered (default: unlimited).}
@endTable
+Notice that wxRichTextCtrl support in XRC is available in wxWidgets 2.9.5 and
+later only and you need to explicitly register its handler using
+@code
+ #include <wx/xrc/xh_richtext.h>
+
+ AddHandler(new wxRichTextCtrl);
+@endcode
+to use it.
+
@subsubsection xrc_wxscrollbar wxScrollBar
#if wxUSE_XRC && wxUSE_RICHTEXT
-class WXDLLIMPEXP_XRC wxRichTextCtrlXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_RICHTEXT wxRichTextCtrlXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxRichTextCtrlXmlHandler)
#include "wx/xml/xml.h"
+#include "wx/xrc/xmlreshandler.h"
+
class WXDLLIMPEXP_FWD_BASE wxFileName;
class WXDLLIMPEXP_FWD_CORE wxIconBundle;
class WXDLLIMPEXP_FWD_CORE wxFrame;
class WXDLLIMPEXP_FWD_CORE wxToolBar;
-class WXDLLIMPEXP_FWD_XRC wxXmlResourceHandler;
class WXDLLIMPEXP_FWD_XRC wxXmlSubclassFactory;
class wxXmlSubclassFactories;
class wxXmlResourceModule;
// domain to pass to translation functions, if any.
wxString m_domain;
- friend class wxXmlResourceHandler;
+ friend class wxXmlResourceHandlerImpl;
friend class wxXmlResourceModule;
friend class wxIdRangeManager;
friend class wxIdRange;
#define XRCSIZERITEM(window, id) \
((window).GetSizer() ? (window).GetSizer()->GetItemById(XRCID(id)) : NULL)
-// wxXmlResourceHandler is an abstract base class for resource handlers
-// capable of creating a control from an XML node.
-class WXDLLIMPEXP_XRC wxXmlResourceHandler : public wxObject
+// wxXmlResourceHandlerImpl is the back-end of the wxXmlResourceHander class to
+// really implementing all its functionality. It is defined in the "xrc"
+// library unlike wxXmlResourceHandler itself which is defined in "core" to
+// allow inheriting from it in the code from the other libraries too.
+
+class WXDLLIMPEXP_XRC wxXmlResourceHandlerImpl : public wxXmlResourceHandlerImplBase
{
-DECLARE_ABSTRACT_CLASS(wxXmlResourceHandler)
public:
// Constructor.
- wxXmlResourceHandler();
+ wxXmlResourceHandlerImpl(wxXmlResourceHandler *handler);
// Destructor.
- virtual ~wxXmlResourceHandler() {}
+ virtual ~wxXmlResourceHandlerImpl() {}
// Creates an object (menu, dialog, control, ...) from an XML node.
// Should check for validity.
wxObject *CreateResource(wxXmlNode *node, wxObject *parent,
wxObject *instance);
- // This one is called from CreateResource after variables
- // were filled.
- virtual wxObject *DoCreateResource() = 0;
-
- // Returns true if it understands this node and can create
- // a resource from it, false otherwise.
- virtual bool CanHandle(wxXmlNode *node) = 0;
-
- // Sets the parent resource.
- void SetParentResource(wxXmlResource *res) { m_resource = res; }
-
-protected:
- wxXmlResource *m_resource;
- wxArrayString m_styleNames;
- wxArrayInt m_styleValues;
-
- // Variables (filled by CreateResource)
- wxXmlNode *m_node;
- wxString m_class;
- wxObject *m_parent, *m_instance;
- wxWindow *m_parentAsWindow;
// --- Handy methods:
// Returns true if the node has a property class equal to classname,
// e.g. <object class="wxDialog">.
- static bool IsOfClass(wxXmlNode *node, const wxString& classname);
+ bool IsOfClass(wxXmlNode *node, const wxString& classname) const;
// Gets node content from wxXML_ENTITY_NODE
// The problem is, <tag>content<tag> is represented as
// Returns the parameter value from given node.
wxString GetParamValue(const wxXmlNode* node);
- // Add a style flag (e.g. wxMB_DOCKABLE) to the list of flags
- // understood by this handler.
- void AddStyle(const wxString& name, int value);
-
- // Add styles common to all wxWindow-derived classes.
- void AddWindowStyles();
-
// Gets style flags from text in form "flag | flag2| flag3 |..."
// Only understands flags added with AddStyle
int GetStyle(const wxString& param = wxT("style"), int defaults = 0);
// Creates a resource from a node.
wxObject *CreateResFromNode(wxXmlNode *node,
- wxObject *parent, wxObject *instance = NULL)
- { return m_resource->CreateResFromNode(node, parent, instance); }
+ wxObject *parent, wxObject *instance = NULL);
// helper
#if wxUSE_FILESYSTEM
- wxFileSystem& GetCurFileSystem() { return m_resource->GetCurFileSystem(); }
+ wxFileSystem& GetCurFileSystem();
#endif
// reports input error at position 'context'
// Programmer-friendly macros for writing XRC handlers:
-#define XRC_ADD_STYLE(style) AddStyle(wxT(#style), style)
-
#define XRC_MAKE_INSTANCE(variable, classname) \
classname *variable = NULL; \
if (m_instance) \
--- /dev/null
+/////////////////////////////////////////////////////////////////////////////
+// Name: wx/xrc/xmlreshandler.cpp
+// Purpose: XML resource handler
+// Author: Steven Lamerton
+// Created: 2011/01/26
+// RCS-ID: $id$
+// Copyright: (c) 2011 Steven Lamerton
+// Licence: wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_XRC_XMLRESHANDLER_H_
+#define _WX_XRC_XMLRESHANDLER_H_
+
+#include "wx/defs.h"
+
+#if wxUSE_XRC
+
+#include "wx/string.h"
+#include "wx/artprov.h"
+#include "wx/colour.h"
+#include "wx/animate.h"
+#include "wx/filesys.h"
+#include "wx/imaglist.h"
+
+class WXDLLIMPEXP_FWD_XML wxXmlNode;
+class WXDLLIMPEXP_FWD_XML wxXmlResource;
+
+class WXDLLIMPEXP_FWD_CORE wxXmlResourceHandler;
+
+// Helper macro used by the classes derived from wxXmlResourceHandler but also
+// by wxXmlResourceHandler implementation itself.
+#define XRC_ADD_STYLE(style) AddStyle(wxT(#style), style)
+
+// Abstract base class for the implementation object used by
+// wxXmlResourceHandlerImpl. The real implementation is in
+// wxXmlResourceHandlerImpl class in the "xrc" library while this class is in
+// the "core" itself -- but it is so small that it doesn't matter.
+
+class WXDLLIMPEXP_CORE wxXmlResourceHandlerImplBase : public wxObject
+{
+public:
+ // Constructor.
+ wxXmlResourceHandlerImplBase(wxXmlResourceHandler *handler)
+ : m_handler(handler)
+ {}
+
+ // Destructor.
+ virtual ~wxXmlResourceHandlerImplBase() {}
+
+ virtual wxObject *CreateResource(wxXmlNode *node, wxObject *parent,
+ wxObject *instance) = 0;
+ virtual bool IsOfClass(wxXmlNode *node, const wxString& classname) const = 0;
+ virtual wxString GetNodeContent(const wxXmlNode *node) = 0;
+ virtual bool HasParam(const wxString& param) = 0;
+ virtual wxXmlNode *GetParamNode(const wxString& param) = 0;
+ virtual wxString GetParamValue(const wxString& param) = 0;
+ virtual wxString GetParamValue(const wxXmlNode* node) = 0;
+ virtual int GetStyle(const wxString& param = wxT("style"), int defaults = 0) = 0;
+ virtual wxString GetText(const wxString& param, bool translate = true) = 0;
+ virtual int GetID() = 0;
+ virtual wxString GetName() = 0;
+ virtual bool GetBool(const wxString& param, bool defaultv = false) = 0;
+ virtual long GetLong(const wxString& param, long defaultv = 0) = 0;
+ virtual float GetFloat(const wxString& param, float defaultv = 0) = 0;
+ virtual wxColour GetColour(const wxString& param,
+ const wxColour& defaultv = wxNullColour) = 0;
+ virtual wxSize GetSize(const wxString& param = wxT("size"),
+ wxWindow *windowToUse = NULL) = 0;
+ virtual wxPoint GetPosition(const wxString& param = wxT("pos")) = 0;
+ virtual wxCoord GetDimension(const wxString& param, wxCoord defaultv = 0,
+ wxWindow *windowToUse = NULL) = 0;
+ virtual wxDirection GetDirection(const wxString& param, wxDirection dir = wxLEFT) = 0;
+ virtual wxBitmap GetBitmap(const wxString& param = wxT("bitmap"),
+ const wxArtClient& defaultArtClient = wxART_OTHER,
+ wxSize size = wxDefaultSize) = 0;
+ virtual wxBitmap GetBitmap(const wxXmlNode* node,
+ const wxArtClient& defaultArtClient = wxART_OTHER,
+ wxSize size = wxDefaultSize) = 0;
+ virtual wxIcon GetIcon(const wxString& param = wxT("icon"),
+ const wxArtClient& defaultArtClient = wxART_OTHER,
+ wxSize size = wxDefaultSize) = 0;
+ virtual wxIcon GetIcon(const wxXmlNode* node,
+ const wxArtClient& defaultArtClient = wxART_OTHER,
+ wxSize size = wxDefaultSize) = 0;
+ virtual wxIconBundle GetIconBundle(const wxString& param,
+ const wxArtClient& defaultArtClient = wxART_OTHER) = 0;
+ virtual wxImageList *GetImageList(const wxString& param = wxT("imagelist")) = 0;
+
+#if wxUSE_ANIMATIONCTRL
+ virtual wxAnimation GetAnimation(const wxString& param = wxT("animation")) = 0;
+#endif
+
+ virtual wxFont GetFont(const wxString& param = wxT("font"), wxWindow* parent = NULL) = 0;
+ virtual bool GetBoolAttr(const wxString& attr, bool defaultv) = 0;
+ virtual void SetupWindow(wxWindow *wnd) = 0;
+ virtual void CreateChildren(wxObject *parent, bool this_hnd_only = false) = 0;
+ virtual void CreateChildrenPrivately(wxObject *parent,
+ wxXmlNode *rootnode = NULL) = 0;
+ virtual wxObject *CreateResFromNode(wxXmlNode *node, wxObject *parent,
+ wxObject *instance = NULL) = 0;
+
+#if wxUSE_FILESYSTEM
+ virtual wxFileSystem& GetCurFileSystem() = 0;
+#endif
+ virtual void ReportError(wxXmlNode *context, const wxString& message) = 0;
+ virtual void ReportError(const wxString& message) = 0;
+ virtual void ReportParamError(const wxString& param, const wxString& message) = 0;
+
+ wxXmlResourceHandler* GetHandler() { return m_handler; }
+
+protected:
+ wxXmlResourceHandler *m_handler;
+};
+
+// Base class for all XRC handlers.
+//
+// Notice that this class is defined in the core library itself and so can be
+// used as the base class by classes in any GUI library. However to actually be
+// usable, it needs to be registered with wxXmlResource which implies linking
+// the application with the xrc library.
+//
+// Also note that all the methods forwarding to GetImpl() are documented only
+// in wxXmlResourceHandlerImpl in wx/xrc/xmlres.h to avoid duplication.
+
+class WXDLLIMPEXP_CORE wxXmlResourceHandler : public wxObject
+{
+public:
+ // Constructor creates an unusable object, before anything can be done with
+ // it, SetImpl() needs to be called as done by wxXmlResource::AddHandler().
+ wxXmlResourceHandler()
+ {
+ m_impl = NULL;
+ }
+
+ // This should be called exactly once.
+ void SetImpl(wxXmlResourceHandlerImplBase* impl)
+ {
+ wxASSERT_MSG( !m_impl, wxS("Should be called exactly once") );
+
+ m_impl = impl;
+ }
+
+
+ // Destructor.
+ virtual ~wxXmlResourceHandler()
+ {
+ delete m_impl;
+ }
+
+ wxObject *CreateResource(wxXmlNode *node, wxObject *parent,
+ wxObject *instance)
+ {
+ return GetImpl()->CreateResource(node, parent, instance);
+ }
+
+ // This one is called from CreateResource after variables
+ // were filled.
+ virtual wxObject *DoCreateResource() = 0;
+
+ // Returns true if it understands this node and can create
+ // a resource from it, false otherwise.
+ virtual bool CanHandle(wxXmlNode *node) = 0;
+
+
+ void SetParentResource(wxXmlResource *res)
+ {
+ m_resource = res;
+ }
+
+
+ // These methods are not forwarded to wxXmlResourceHandlerImpl because they
+ // are called from the derived classes ctors and so before SetImpl() can be
+ // called.
+
+ // Add a style flag (e.g. wxMB_DOCKABLE) to the list of flags
+ // understood by this handler.
+ void AddStyle(const wxString& name, int value);
+
+ // Add styles common to all wxWindow-derived classes.
+ void AddWindowStyles();
+
+protected:
+ // Everything else is simply forwarded to wxXmlResourceHandlerImpl.
+ void ReportError(wxXmlNode *context, const wxString& message)
+ {
+ return GetImpl()->ReportError(context, message);
+ }
+ void ReportError(const wxString& message)
+ {
+ return GetImpl()->ReportError(message);
+ }
+ void ReportParamError(const wxString& param, const wxString& message)
+ {
+ return GetImpl()->ReportParamError(param, message);
+ }
+
+ bool IsOfClass(wxXmlNode *node, const wxString& classname) const
+ {
+ return GetImpl()->IsOfClass(node, classname);
+ }
+ wxString GetNodeContent(const wxXmlNode *node)
+ {
+ return GetImpl()->GetNodeContent(node);
+ }
+ bool HasParam(const wxString& param)
+ {
+ return GetImpl()->HasParam(param);
+ }
+
+ wxXmlNode *GetParamNode(const wxString& param)
+ {
+ return GetImpl()->GetParamNode(param);
+ }
+ wxString GetParamValue(const wxString& param)
+ {
+ return GetImpl()->GetParamValue(param);
+ }
+ wxString GetParamValue(const wxXmlNode* node)
+ {
+ return GetImpl()->GetParamValue(node);
+ }
+ int GetStyle(const wxString& param = wxT("style"), int defaults = 0)
+ {
+ return GetImpl()->GetStyle(param, defaults);
+ }
+ wxString GetText(const wxString& param, bool translate = true)
+ {
+ return GetImpl()->GetText(param, translate);
+ }
+ int GetID() const
+ {
+ return GetImpl()->GetID();
+ }
+ wxString GetName()
+ {
+ return GetImpl()->GetName();
+ }
+ bool GetBool(const wxString& param, bool defaultv = false)
+ {
+ return GetImpl()->GetBool(param, defaultv);
+ }
+ long GetLong(const wxString& param, long defaultv = 0)
+ {
+ return GetImpl()->GetLong(param, defaultv);
+ }
+ float GetFloat(const wxString& param, float defaultv = 0)
+ {
+ return GetImpl()->GetFloat(param, defaultv);
+ }
+ wxColour GetColour(const wxString& param,
+ const wxColour& defaultv = wxNullColour)
+ {
+ return GetImpl()->GetColour(param, defaultv);
+ }
+ wxSize GetSize(const wxString& param = wxT("size"),
+ wxWindow *windowToUse = NULL)
+ {
+ return GetImpl()->GetSize(param, windowToUse);
+ }
+ wxPoint GetPosition(const wxString& param = wxT("pos"))
+ {
+ return GetImpl()->GetPosition(param);
+ }
+ wxCoord GetDimension(const wxString& param, wxCoord defaultv = 0,
+ wxWindow *windowToUse = NULL)
+ {
+ return GetImpl()->GetDimension(param, defaultv, windowToUse);
+ }
+ wxDirection GetDirection(const wxString& param, wxDirection dir = wxLEFT)
+ {
+ return GetImpl()->GetDirection(param, dir);
+ }
+ wxBitmap GetBitmap(const wxString& param = wxT("bitmap"),
+ const wxArtClient& defaultArtClient = wxART_OTHER,
+ wxSize size = wxDefaultSize)
+ {
+ return GetImpl()->GetBitmap(param, defaultArtClient, size);
+ }
+ wxBitmap GetBitmap(const wxXmlNode* node,
+ const wxArtClient& defaultArtClient = wxART_OTHER,
+ wxSize size = wxDefaultSize)
+ {
+ return GetImpl()->GetBitmap(node, defaultArtClient, size);
+ }
+ wxIcon GetIcon(const wxString& param = wxT("icon"),
+ const wxArtClient& defaultArtClient = wxART_OTHER,
+ wxSize size = wxDefaultSize)
+ {
+ return GetImpl()->GetIcon(param, defaultArtClient, size);
+ }
+ wxIcon GetIcon(const wxXmlNode* node,
+ const wxArtClient& defaultArtClient = wxART_OTHER,
+ wxSize size = wxDefaultSize)
+ {
+ return GetImpl()->GetIcon(node, defaultArtClient, size);
+ }
+ wxIconBundle GetIconBundle(const wxString& param,
+ const wxArtClient& defaultArtClient = wxART_OTHER)
+ {
+ return GetImpl()->GetIconBundle(param, defaultArtClient);
+ }
+ wxImageList *GetImageList(const wxString& param = wxT("imagelist"))
+ {
+ return GetImpl()->GetImageList(param);
+ }
+
+#if wxUSE_ANIMATIONCTRL
+ wxAnimation GetAnimation(const wxString& param = wxT("animation"))
+ {
+ return GetImpl()->GetAnimation(param);
+ }
+#endif
+
+ wxFont GetFont(const wxString& param = wxT("font"),
+ wxWindow* parent = NULL)
+ {
+ return GetImpl()->GetFont(param, parent);
+ }
+ bool GetBoolAttr(const wxString& attr, bool defaultv)
+ {
+ return GetImpl()->GetBoolAttr(attr, defaultv);
+ }
+ void SetupWindow(wxWindow *wnd)
+ {
+ GetImpl()->SetupWindow(wnd);
+ }
+ void CreateChildren(wxObject *parent, bool this_hnd_only = false)
+ {
+ GetImpl()->CreateChildren(parent, this_hnd_only);
+ }
+ void CreateChildrenPrivately(wxObject *parent, wxXmlNode *rootnode = NULL)
+ {
+ GetImpl()->CreateChildrenPrivately(parent, rootnode);
+ }
+ wxObject *CreateResFromNode(wxXmlNode *node,
+ wxObject *parent, wxObject *instance = NULL)
+ {
+ return GetImpl()->CreateResFromNode(node, parent, instance);
+ }
+
+#if wxUSE_FILESYSTEM
+ wxFileSystem& GetCurFileSystem()
+ {
+ return GetImpl()->GetCurFileSystem();
+ }
+#endif
+
+ // Variables (filled by CreateResource)
+ wxXmlNode *m_node;
+ wxString m_class;
+ wxObject *m_parent, *m_instance;
+ wxWindow *m_parentAsWindow;
+ wxXmlResource *m_resource;
+
+ wxArrayString m_styleNames;
+ wxArrayInt m_styleValues;
+
+ friend class wxXmlResourceHandlerImpl;
+
+private:
+ // This is supposed to never return NULL because SetImpl() should have been
+ // called.
+ wxXmlResourceHandlerImplBase* GetImpl() const;
+
+ wxXmlResourceHandlerImplBase *m_impl;
+
+ wxDECLARE_ABSTRACT_CLASS(wxXmlResourceHandler);
+};
+
+#endif // wxUSE_XRC
+
+#endif // _WX_XRC_XMLRESHANDLER_H_
#pragma hdrstop
#endif
-#if wxUSE_XRC && wxUSE_RICHTEXT && wxUSE_RICHTEXT_XML_HANDLER
+#if wxUSE_XRC && wxUSE_RICHTEXT
#include "wx/xrc/xh_richtext.h"
-
#include "wx/richtext/richtextctrl.h"
IMPLEMENT_DYNAMIC_CLASS(wxRichTextCtrlXmlHandler, wxXmlResourceHandler)
// ============================================================================
#if wxUSE_ANIMATIONCTRL
-wxAnimation wxXmlResourceHandler::GetAnimation(const wxString& param)
+wxAnimation wxXmlResourceHandlerImpl::GetAnimation(const wxString& param)
{
const wxString name = GetParamValue(param);
if ( name.empty() )
}
-IMPLEMENT_ABSTRACT_CLASS(wxXmlResourceHandler, wxObject)
-
void wxXmlResource::AddHandler(wxXmlResourceHandler *handler)
{
+ wxXmlResourceHandlerImpl *impl = new wxXmlResourceHandlerImpl(handler);
+ handler->SetImpl(impl);
m_handlers.push_back(handler);
handler->SetParentResource(this);
}
void wxXmlResource::InsertHandler(wxXmlResourceHandler *handler)
{
+ wxXmlResourceHandlerImpl *impl = new wxXmlResourceHandlerImpl(handler);
+ handler->SetImpl(impl);
m_handlers.insert(m_handlers.begin(), handler);
handler->SetParentResource(this);
}
-wxXmlResourceHandler::wxXmlResourceHandler()
- : m_node(NULL), m_parent(NULL), m_instance(NULL),
- m_parentAsWindow(NULL)
-{}
+wxXmlResourceHandlerImpl::wxXmlResourceHandlerImpl(wxXmlResourceHandler *handler)
+ :wxXmlResourceHandlerImplBase(handler)
+{
+}
+wxObject *wxXmlResourceHandlerImpl::CreateResFromNode(wxXmlNode *node,
+ wxObject *parent, wxObject *instance)
+{
+ return m_handler->m_resource->CreateResFromNode(node, parent, instance);
+}
+
+#if wxUSE_FILESYSTEM
+wxFileSystem& wxXmlResourceHandlerImpl::GetCurFileSystem()
+{
+ return m_handler->m_resource->GetCurFileSystem();
+}
+#endif
-wxObject *wxXmlResourceHandler::CreateResource(wxXmlNode *node, wxObject *parent, wxObject *instance)
+wxObject *wxXmlResourceHandlerImpl::CreateResource(wxXmlNode *node, wxObject *parent, wxObject *instance)
{
- wxXmlNode *myNode = m_node;
- wxString myClass = m_class;
- wxObject *myParent = m_parent, *myInstance = m_instance;
- wxWindow *myParentAW = m_parentAsWindow;
+ wxXmlNode *myNode = m_handler->m_node;
+ wxString myClass = m_handler->m_class;
+ wxObject *myParent = m_handler->m_parent, *myInstance = m_handler->m_instance;
+ wxWindow *myParentAW = m_handler->m_parentAsWindow;
- m_instance = instance;
- if (!m_instance && node->HasAttribute(wxT("subclass")) &&
- !(m_resource->GetFlags() & wxXRC_NO_SUBCLASSING))
+ m_handler->m_instance = instance;
+ if (!m_handler->m_instance && node->HasAttribute(wxT("subclass")) &&
+ !(m_handler->m_resource->GetFlags() & wxXRC_NO_SUBCLASSING))
{
wxString subclass = node->GetAttribute(wxT("subclass"), wxEmptyString);
if (!subclass.empty())
for (wxXmlSubclassFactories::iterator i = wxXmlResource::ms_subclassFactories->begin();
i != wxXmlResource::ms_subclassFactories->end(); ++i)
{
- m_instance = (*i)->Create(subclass);
- if (m_instance)
+ m_handler->m_instance = (*i)->Create(subclass);
+ if (m_handler->m_instance)
break;
}
- if (!m_instance)
+ if (!m_handler->m_instance)
{
wxString name = node->GetAttribute(wxT("name"), wxEmptyString);
ReportError
}
}
- m_node = node;
- m_class = node->GetAttribute(wxT("class"), wxEmptyString);
- m_parent = parent;
- m_parentAsWindow = wxDynamicCast(m_parent, wxWindow);
+ m_handler->m_node = node;
+ m_handler->m_class = node->GetAttribute(wxT("class"), wxEmptyString);
+ m_handler->m_parent = parent;
+ m_handler->m_parentAsWindow = wxDynamicCast(m_handler->m_parent, wxWindow);
- wxObject *returned = DoCreateResource();
+ wxObject *returned = GetHandler()->DoCreateResource();
- m_node = myNode;
- m_class = myClass;
- m_parent = myParent; m_parentAsWindow = myParentAW;
- m_instance = myInstance;
+ m_handler->m_node = myNode;
+ m_handler->m_class = myClass;
+ m_handler->m_parent = myParent; m_handler->m_parentAsWindow = myParentAW;
+ m_handler->m_instance = myInstance;
return returned;
}
-
-void wxXmlResourceHandler::AddStyle(const wxString& name, int value)
-{
- m_styleNames.Add(name);
- m_styleValues.Add(value);
-}
-
-
-
-void wxXmlResourceHandler::AddWindowStyles()
-{
- XRC_ADD_STYLE(wxCLIP_CHILDREN);
-
- // the border styles all have the old and new names, recognize both for now
- XRC_ADD_STYLE(wxSIMPLE_BORDER); XRC_ADD_STYLE(wxBORDER_SIMPLE);
- XRC_ADD_STYLE(wxSUNKEN_BORDER); XRC_ADD_STYLE(wxBORDER_SUNKEN);
- XRC_ADD_STYLE(wxDOUBLE_BORDER); XRC_ADD_STYLE(wxBORDER_DOUBLE); // deprecated
- XRC_ADD_STYLE(wxBORDER_THEME);
- XRC_ADD_STYLE(wxRAISED_BORDER); XRC_ADD_STYLE(wxBORDER_RAISED);
- XRC_ADD_STYLE(wxSTATIC_BORDER); XRC_ADD_STYLE(wxBORDER_STATIC);
- XRC_ADD_STYLE(wxNO_BORDER); XRC_ADD_STYLE(wxBORDER_NONE);
- XRC_ADD_STYLE(wxBORDER_DEFAULT);
-
- XRC_ADD_STYLE(wxTRANSPARENT_WINDOW);
- XRC_ADD_STYLE(wxWANTS_CHARS);
- XRC_ADD_STYLE(wxTAB_TRAVERSAL);
- XRC_ADD_STYLE(wxNO_FULL_REPAINT_ON_RESIZE);
- XRC_ADD_STYLE(wxFULL_REPAINT_ON_RESIZE);
- XRC_ADD_STYLE(wxVSCROLL);
- XRC_ADD_STYLE(wxHSCROLL);
- XRC_ADD_STYLE(wxALWAYS_SHOW_SB);
-
- XRC_ADD_STYLE(wxWS_EX_BLOCK_EVENTS);
- XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
- XRC_ADD_STYLE(wxWS_EX_TRANSIENT);
- XRC_ADD_STYLE(wxWS_EX_CONTEXTHELP);
- XRC_ADD_STYLE(wxWS_EX_PROCESS_IDLE);
- XRC_ADD_STYLE(wxWS_EX_PROCESS_UI_UPDATES);
-}
-
-
-
-bool wxXmlResourceHandler::HasParam(const wxString& param)
+bool wxXmlResourceHandlerImpl::HasParam(const wxString& param)
{
return (GetParamNode(param) != NULL);
}
-int wxXmlResourceHandler::GetStyle(const wxString& param, int defaults)
+int wxXmlResourceHandlerImpl::GetStyle(const wxString& param, int defaults)
{
wxString s = GetParamValue(param);
while (tkn.HasMoreTokens())
{
fl = tkn.GetNextToken();
- index = m_styleNames.Index(fl);
+ index = m_handler->m_styleNames.Index(fl);
if (index != wxNOT_FOUND)
{
- style |= m_styleValues[index];
+ style |= m_handler->m_styleValues[index];
}
else
{
-wxString wxXmlResourceHandler::GetText(const wxString& param, bool translate)
+wxString wxXmlResourceHandlerImpl::GetText(const wxString& param, bool translate)
{
wxXmlNode *parNode = GetParamNode(param);
wxString str1(GetNodeContent(parNode));
wxString str2;
// "\\" wasn't translated to "\" prior to 2.5.3.0:
- const bool escapeBackslash = (m_resource->CompareVersion(2,5,3,0) >= 0);
+ const bool escapeBackslash = (m_handler->m_resource->CompareVersion(2,5,3,0) >= 0);
// VS: First version of XRC resources used $ instead of & (which is
// illegal in XML), but later I realized that '_' fits this purpose
// much better (because &File means "File with F underlined").
- const wxChar amp_char = (m_resource->CompareVersion(2,3,0,1) < 0)
+ const wxChar amp_char = (m_handler->m_resource->CompareVersion(2,3,0,1) < 0)
? '$' : '_';
for ( wxString::const_iterator dt = str1.begin(); dt != str1.end(); ++dt )
}
}
- if (m_resource->GetFlags() & wxXRC_USE_LOCALE)
+ if (m_handler->m_resource->GetFlags() & wxXRC_USE_LOCALE)
{
if (translate && parNode &&
parNode->GetAttribute(wxT("translate"), wxEmptyString) != wxT("0"))
{
- return wxGetTranslation(str2, m_resource->GetDomain());
+ return wxGetTranslation(str2, m_handler->m_resource->GetDomain());
}
else
{
-long wxXmlResourceHandler::GetLong(const wxString& param, long defaultv)
+long wxXmlResourceHandlerImpl::GetLong(const wxString& param, long defaultv)
{
long value = defaultv;
wxString str1 = GetParamValue(param);
return value;
}
-float wxXmlResourceHandler::GetFloat(const wxString& param, float defaultv)
+float wxXmlResourceHandlerImpl::GetFloat(const wxString& param, float defaultv)
{
wxString str = GetParamValue(param);
}
-int wxXmlResourceHandler::GetID()
+int wxXmlResourceHandlerImpl::GetID()
{
return wxXmlResource::GetXRCID(GetName());
}
-wxString wxXmlResourceHandler::GetName()
+wxString wxXmlResourceHandlerImpl::GetName()
{
- return m_node->GetAttribute(wxT("name"), wxT("-1"));
+ return m_handler->m_node->GetAttribute(wxT("name"), wxT("-1"));
}
-bool wxXmlResourceHandler::GetBoolAttr(const wxString& attr, bool defaultv)
+bool wxXmlResourceHandlerImpl::GetBoolAttr(const wxString& attr, bool defaultv)
{
wxString v;
- return m_node->GetAttribute(attr, &v) ? v == '1' : defaultv;
+ return m_handler->m_node->GetAttribute(attr, &v) ? v == '1' : defaultv;
}
-bool wxXmlResourceHandler::GetBool(const wxString& param, bool defaultv)
+bool wxXmlResourceHandlerImpl::GetBool(const wxString& param, bool defaultv)
{
const wxString v = GetParamValue(param);
return wxNullColour;
}
-wxColour wxXmlResourceHandler::GetColour(const wxString& param, const wxColour& defaultv)
+wxColour wxXmlResourceHandlerImpl::GetColour(const wxString& param, const wxColour& defaultv)
{
wxString v = GetParamValue(param);
} // anonymous namespace
-wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param,
+wxBitmap wxXmlResourceHandlerImpl::GetBitmap(const wxString& param,
const wxArtClient& defaultArtClient,
wxSize size)
{
return GetBitmap(node, defaultArtClient, size);
}
-wxBitmap wxXmlResourceHandler::GetBitmap(const wxXmlNode* node,
+wxBitmap wxXmlResourceHandlerImpl::GetBitmap(const wxXmlNode* node,
const wxArtClient& defaultArtClient,
wxSize size)
{
}
-wxIcon wxXmlResourceHandler::GetIcon(const wxString& param,
+wxIcon wxXmlResourceHandlerImpl::GetIcon(const wxString& param,
const wxArtClient& defaultArtClient,
wxSize size)
{
return GetIcon(node, defaultArtClient, size);
}
-wxIcon wxXmlResourceHandler::GetIcon(const wxXmlNode* node,
+wxIcon wxXmlResourceHandlerImpl::GetIcon(const wxXmlNode* node,
const wxArtClient& defaultArtClient,
wxSize size)
{
}
-wxIconBundle wxXmlResourceHandler::GetIconBundle(const wxString& param,
+wxIconBundle wxXmlResourceHandlerImpl::GetIconBundle(const wxString& param,
const wxArtClient& defaultArtClient)
{
wxString art_id, art_client;
}
-wxImageList *wxXmlResourceHandler::GetImageList(const wxString& param)
+wxImageList *wxXmlResourceHandlerImpl::GetImageList(const wxString& param)
{
wxXmlNode * const imagelist_node = GetParamNode(param);
if ( !imagelist_node )
return NULL;
- wxXmlNode * const oldnode = m_node;
- m_node = imagelist_node;
+ wxXmlNode * const oldnode = m_handler->m_node;
+ m_handler->m_node = imagelist_node;
// Get the size if we have it, otherwise we will use the size of the first
// list element.
wxString parambitmap = wxT("bitmap");
if ( HasParam(parambitmap) )
{
- wxXmlNode *n = m_node->GetChildren();
+ wxXmlNode *n = m_handler->m_node->GetChildren();
while (n)
{
if (n->GetType() == wxXML_ELEMENT_NODE && n->GetName() == parambitmap)
}
}
- m_node = oldnode;
+ m_handler->m_node = oldnode;
return imagelist;
}
-wxXmlNode *wxXmlResourceHandler::GetParamNode(const wxString& param)
+wxXmlNode *wxXmlResourceHandlerImpl::GetParamNode(const wxString& param)
{
- wxCHECK_MSG(m_node, NULL, wxT("You can't access handler data before it was initialized!"));
+ wxCHECK_MSG(m_handler->m_node, NULL, wxT("You can't access handler data before it was initialized!"));
- wxXmlNode *n = m_node->GetChildren();
+ wxXmlNode *n = m_handler->m_node->GetChildren();
while (n)
{
return NULL;
}
-/* static */
-bool wxXmlResourceHandler::IsOfClass(wxXmlNode *node, const wxString& classname)
+bool wxXmlResourceHandlerImpl::IsOfClass(wxXmlNode *node, const wxString& classname) const
{
return node->GetAttribute(wxT("class")) == classname;
}
-wxString wxXmlResourceHandler::GetNodeContent(const wxXmlNode *node)
+wxString wxXmlResourceHandlerImpl::GetNodeContent(const wxXmlNode *node)
{
const wxXmlNode *n = node;
if (n == NULL) return wxEmptyString;
-wxString wxXmlResourceHandler::GetParamValue(const wxString& param)
+wxString wxXmlResourceHandlerImpl::GetParamValue(const wxString& param)
{
if (param.empty())
- return GetNodeContent(m_node);
+ return GetNodeContent(m_handler->m_node);
else
return GetNodeContent(GetParamNode(param));
}
-wxString wxXmlResourceHandler::GetParamValue(const wxXmlNode* node)
+wxString wxXmlResourceHandlerImpl::GetParamValue(const wxXmlNode* node)
{
return GetNodeContent(node);
}
-wxSize wxXmlResourceHandler::GetSize(const wxString& param,
+wxSize wxXmlResourceHandlerImpl::GetSize(const wxString& param,
wxWindow *windowToUse)
{
wxString s = GetParamValue(param);
{
return wxDLG_UNIT(windowToUse, wxSize(sx, sy));
}
- else if (m_parentAsWindow)
+ else if (m_handler->m_parentAsWindow)
{
- return wxDLG_UNIT(m_parentAsWindow, wxSize(sx, sy));
+ return wxDLG_UNIT(m_handler->m_parentAsWindow, wxSize(sx, sy));
}
else
{
-wxPoint wxXmlResourceHandler::GetPosition(const wxString& param)
+wxPoint wxXmlResourceHandlerImpl::GetPosition(const wxString& param)
{
wxSize sz = GetSize(param);
return wxPoint(sz.x, sz.y);
-wxCoord wxXmlResourceHandler::GetDimension(const wxString& param,
+wxCoord wxXmlResourceHandlerImpl::GetDimension(const wxString& param,
wxCoord defaultv,
wxWindow *windowToUse)
{
{
return wxDLG_UNIT(windowToUse, wxSize(sx, 0)).x;
}
- else if (m_parentAsWindow)
+ else if (m_handler->m_parentAsWindow)
{
- return wxDLG_UNIT(m_parentAsWindow, wxSize(sx, 0)).x;
+ return wxDLG_UNIT(m_handler->m_parentAsWindow, wxSize(sx, 0)).x;
}
else
{
}
wxDirection
-wxXmlResourceHandler::GetDirection(const wxString& param, wxDirection dirDefault)
+wxXmlResourceHandlerImpl::GetDirection(const wxString& param, wxDirection dirDefault)
{
wxDirection dir;
return wxNullFont;
}
-wxFont wxXmlResourceHandler::GetFont(const wxString& param, wxWindow* parent)
+wxFont wxXmlResourceHandlerImpl::GetFont(const wxString& param, wxWindow* parent)
{
wxXmlNode *font_node = GetParamNode(param);
if (font_node == NULL)
return wxNullFont;
}
- wxXmlNode *oldnode = m_node;
- m_node = font_node;
+ wxXmlNode *oldnode = m_handler->m_node;
+ m_handler->m_node = font_node;
// font attributes:
underlined, facename, enc);
}
- m_node = oldnode;
+ m_handler->m_node = oldnode;
return font;
}
-void wxXmlResourceHandler::SetupWindow(wxWindow *wnd)
+void wxXmlResourceHandlerImpl::SetupWindow(wxWindow *wnd)
{
//FIXME : add cursor
}
-void wxXmlResourceHandler::CreateChildren(wxObject *parent, bool this_hnd_only)
+void wxXmlResourceHandlerImpl::CreateChildren(wxObject *parent, bool this_hnd_only)
{
- for ( wxXmlNode *n = m_node->GetChildren(); n; n = n->GetNext() )
+ for ( wxXmlNode *n = m_handler->m_node->GetChildren(); n; n = n->GetNext() )
{
if ( IsObjectNode(n) )
{
- m_resource->DoCreateResFromNode(*n, parent, NULL,
- this_hnd_only ? this : NULL);
- }
+ m_handler->m_resource->DoCreateResFromNode(*n, parent, NULL,
+ this_hnd_only ? this->GetHandler() : NULL);
+ }
}
}
-void wxXmlResourceHandler::CreateChildrenPrivately(wxObject *parent, wxXmlNode *rootnode)
+void wxXmlResourceHandlerImpl::CreateChildrenPrivately(wxObject *parent, wxXmlNode *rootnode)
{
wxXmlNode *root;
- if (rootnode == NULL) root = m_node; else root = rootnode;
+ if (rootnode == NULL) root = m_handler->m_node; else root = rootnode;
wxXmlNode *n = root->GetChildren();
while (n)
{
- if (n->GetType() == wxXML_ELEMENT_NODE && CanHandle(n))
+ if (n->GetType() == wxXML_ELEMENT_NODE && GetHandler()->CanHandle(n))
{
CreateResource(n, parent, NULL);
}
// errors reporting
//-----------------------------------------------------------------------------
-void wxXmlResourceHandler::ReportError(const wxString& message)
+void wxXmlResourceHandlerImpl::ReportError(const wxString& message)
{
- m_resource->ReportError(m_node, message);
+ m_handler->m_resource->ReportError(m_handler->m_node, message);
}
-void wxXmlResourceHandler::ReportError(wxXmlNode *context,
+void wxXmlResourceHandlerImpl::ReportError(wxXmlNode *context,
const wxString& message)
{
- m_resource->ReportError(context ? context : m_node, message);
+ m_handler->m_resource->ReportError(context ? context : m_handler->m_node, message);
}
-void wxXmlResourceHandler::ReportParamError(const wxString& param,
+void wxXmlResourceHandlerImpl::ReportParamError(const wxString& param,
const wxString& message)
{
- m_resource->ReportError(GetParamNode(param), message);
+ m_handler->m_resource->ReportError(GetParamNode(param), message);
}
void wxXmlResource::ReportError(const wxXmlNode *context, const wxString& message)
--- /dev/null
+/////////////////////////////////////////////////////////////////////////////
+// Name: src/xrc/xmlreshandler.cpp
+// Purpose: XML resource handler
+// Author: Steven Lamerton
+// Created: 2011/01/26
+// RCS-ID: $id$
+// Copyright: (c) 2011 Steven Lamerton
+// Licence: wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+ #pragma hdrstop
+#endif
+
+#if wxUSE_XRC
+
+#include "wx/xrc/xmlreshandler.h"
+
+IMPLEMENT_ABSTRACT_CLASS(wxXmlResourceHandler, wxObject)
+
+wxXmlResourceHandlerImplBase* wxXmlResourceHandler::GetImpl() const
+{
+ if ( !m_impl )
+ {
+ wxFAIL_MSG(wxT("SetImpl() must have been called!"));
+ }
+
+ return m_impl;
+}
+
+void wxXmlResourceHandler::AddStyle(const wxString& name, int value)
+{
+ m_styleNames.Add(name);
+ m_styleValues.Add(value);
+}
+
+void wxXmlResourceHandler::AddWindowStyles()
+{
+ XRC_ADD_STYLE(wxCLIP_CHILDREN);
+
+ // the border styles all have the old and new names, recognize both for now
+ XRC_ADD_STYLE(wxSIMPLE_BORDER); XRC_ADD_STYLE(wxBORDER_SIMPLE);
+ XRC_ADD_STYLE(wxSUNKEN_BORDER); XRC_ADD_STYLE(wxBORDER_SUNKEN);
+ XRC_ADD_STYLE(wxDOUBLE_BORDER); XRC_ADD_STYLE(wxBORDER_DOUBLE); // deprecated
+ XRC_ADD_STYLE(wxBORDER_THEME);
+ XRC_ADD_STYLE(wxRAISED_BORDER); XRC_ADD_STYLE(wxBORDER_RAISED);
+ XRC_ADD_STYLE(wxSTATIC_BORDER); XRC_ADD_STYLE(wxBORDER_STATIC);
+ XRC_ADD_STYLE(wxNO_BORDER); XRC_ADD_STYLE(wxBORDER_NONE);
+ XRC_ADD_STYLE(wxBORDER_DEFAULT);
+
+ XRC_ADD_STYLE(wxTRANSPARENT_WINDOW);
+ XRC_ADD_STYLE(wxWANTS_CHARS);
+ XRC_ADD_STYLE(wxTAB_TRAVERSAL);
+ XRC_ADD_STYLE(wxNO_FULL_REPAINT_ON_RESIZE);
+ XRC_ADD_STYLE(wxFULL_REPAINT_ON_RESIZE);
+ XRC_ADD_STYLE(wxVSCROLL);
+ XRC_ADD_STYLE(wxHSCROLL);
+ XRC_ADD_STYLE(wxALWAYS_SHOW_SB);
+ XRC_ADD_STYLE(wxWS_EX_BLOCK_EVENTS);
+ XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
+ XRC_ADD_STYLE(wxWS_EX_TRANSIENT);
+ XRC_ADD_STYLE(wxWS_EX_CONTEXTHELP);
+ XRC_ADD_STYLE(wxWS_EX_PROCESS_IDLE);
+ XRC_ADD_STYLE(wxWS_EX_PROCESS_UI_UPDATES);
+}
+
+#endif // wxUSE_XRC
#if wxUSE_RADIOBTN
AddHandler(new wxRadioButtonXmlHandler);
#endif
-#if 0 && wxUSE_RICHTEXT
- AddHandler(new wxRichTextCtrlXmlHandler);
-#endif
#if wxUSE_SCROLLBAR
AddHandler(new wxScrollBarXmlHandler);
#endif
projects / wxWidgets.git / commitdiff
