diff --git a/Makefile.in b/Makefile.in index b47f71ca2e..03d778e638 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1970,7 +1970,8 @@ RICHTEXTDLL_OBJECTS = \ 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) \ @@ -1987,7 +1988,8 @@ RICHTEXTLIB_OBJECTS = \ 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) \ @@ -4245,6 +4247,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/vscroll.h \ wx/xpmdecod.h \ wx/xpmhand.h \ + wx/xrc/xmlreshandler.h \ $(LOWLEVEL_HDR) \ $(GUI_CORE_HEADERS) \ $(ADVANCED_HDR) \ @@ -4385,6 +4388,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ 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 \ @@ -4694,6 +4698,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \ monodll_richtextstyles.o \ monodll_richtextsymboldlg.o \ monodll_richtextxml.o \ + monodll_xh_richtext.o \ monodll_stc.o \ monodll_PlatWX.o \ monodll_ScintillaWX.o @@ -4861,7 +4866,8 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ 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) \ @@ -5079,7 +5085,8 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ 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 @@ -6924,6 +6931,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \ monolib_richtextstyles.o \ monolib_richtextsymboldlg.o \ monolib_richtextxml.o \ + monolib_xh_richtext.o \ monolib_stc.o \ monolib_PlatWX.o \ monolib_ScintillaWX.o @@ -7091,7 +7099,8 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ 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) \ @@ -7309,7 +7318,8 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ 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 @@ -9496,7 +9506,8 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ 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) \ @@ -9714,7 +9725,8 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ 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 @@ -11165,7 +11177,8 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ 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) \ @@ -11383,7 +11396,8 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ 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 @@ -18650,6 +18664,9 @@ monodll_richtextsymboldlg.o: $(srcdir)/src/richtext/richtextsymboldlg.cpp $(MONO 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 @@ -21953,6 +21970,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @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 @@ -24395,6 +24415,9 @@ monolib_richtextsymboldlg.o: $(srcdir)/src/richtext/richtextsymboldlg.cpp $(MONO 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 @@ -27698,6 +27721,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @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 @@ -33608,6 +33634,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @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 @@ -37901,6 +37930,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @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 @@ -39716,6 +39748,9 @@ richtextdll_richtextsymboldlg.o: $(srcdir)/src/richtext/richtextsymboldlg.cpp $( 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 @@ -39746,6 +39781,9 @@ richtextlib_richtextsymboldlg.o: $(srcdir)/src/richtext/richtextsymboldlg.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 diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 7864c47ad8..9842bc800b 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -784,6 +784,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/treebkg.cpp src/generic/vlbox.cpp src/generic/vscroll.cpp + src/xrc/xmlreshandler.cpp wx/affinematrix2dbase.h @@ -1013,6 +1014,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/vscroll.h wx/xpmdecod.h wx/xpmhand.h + wx/xrc/xmlreshandler.h @@ -3428,8 +3430,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/xrc/xh_propdlg.cpp src/xrc/xh_radbt.cpp src/xrc/xh_radbx.cpp - - src/xrc/xh_scrol.cpp src/xrc/xh_scwin.cpp src/xrc/xh_htmllbox.cpp @@ -3498,7 +3498,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/xrc/xh_propdlg.h wx/xrc/xh_radbt.h wx/xrc/xh_radbx.h - wx/xrc/xh_scrol.h wx/xrc/xh_scwin.h wx/xrc/xh_htmllbox.h @@ -3715,6 +3714,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/richtext/richtextstyles.cpp src/richtext/richtextsymboldlg.cpp src/richtext/richtextxml.cpp + src/xrc/xh_richtext.cpp wx/richtext/richtextbackgroundpage.h @@ -3739,6 +3739,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/richtext/richtexttabspage.h wx/richtext/richtextuicustomization.h wx/richtext/richtextxml.h + wx/xrc/xh_richtext.h diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index ab39f43537..dd964ada80 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -1463,7 +1463,8 @@ RICHTEXTDLL_OBJECTS = \ $(OBJS)\richtextdll_richtextstyledlg.obj \ $(OBJS)\richtextdll_richtextstyles.obj \ $(OBJS)\richtextdll_richtextsymboldlg.obj \ - $(OBJS)\richtextdll_richtextxml.obj + $(OBJS)\richtextdll_richtextxml.obj \ + $(OBJS)\richtextdll_xh_richtext.obj RICHTEXTLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ @@ -1484,7 +1485,8 @@ RICHTEXTLIB_OBJECTS = \ $(OBJS)\richtextlib_richtextstyledlg.obj \ $(OBJS)\richtextlib_richtextstyles.obj \ $(OBJS)\richtextlib_richtextsymboldlg.obj \ - $(OBJS)\richtextlib_richtextxml.obj + $(OBJS)\richtextlib_richtextxml.obj \ + $(OBJS)\richtextlib_xh_richtext.obj STCDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ @@ -1748,6 +1750,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_richtextstyles.obj \ $(OBJS)\monodll_richtextsymboldlg.obj \ $(OBJS)\monodll_richtextxml.obj \ + $(OBJS)\monodll_xh_richtext.obj \ $(OBJS)\monodll_stc.obj \ $(OBJS)\monodll_PlatWX.obj \ $(OBJS)\monodll_ScintillaWX.obj @@ -1796,7 +1799,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_region.obj \ $(OBJS)\monodll_renderer.obj \ $(OBJS)\monodll_settings.obj \ - $(OBJS)\monodll_textmeasure.obj \ + $(OBJS)\monodll_textmeasure.obj \ $(OBJS)\monodll_tooltip.obj \ $(OBJS)\monodll_toplevel.obj \ $(OBJS)\monodll_uiaction.obj \ @@ -1982,7 +1985,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_tbarbase.obj \ $(OBJS)\monodll_textcmn.obj \ $(OBJS)\monodll_textentrycmn.obj \ - $(OBJS)\monodll_textmeasurecmn.obj \ + $(OBJS)\monodll_textmeasurecmn.obj \ $(OBJS)\monodll_toplvcmn.obj \ $(OBJS)\monodll_treebase.obj \ $(OBJS)\monodll_uiactioncmn.obj \ @@ -2027,7 +2030,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_treectlg.obj \ $(OBJS)\monodll_treebkg.obj \ $(OBJS)\monodll_vlbox.obj \ - $(OBJS)\monodll_vscroll.obj + $(OBJS)\monodll_vscroll.obj \ + $(OBJS)\monodll_xmlreshandler.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" ____CORE_SRC_FILENAMES_OBJECTS = \ @@ -2073,7 +2077,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_region.obj \ $(OBJS)\monodll_renderer.obj \ $(OBJS)\monodll_settings.obj \ - $(OBJS)\monodll_textmeasure.obj \ + $(OBJS)\monodll_textmeasure.obj \ $(OBJS)\monodll_tooltip.obj \ $(OBJS)\monodll_toplevel.obj \ $(OBJS)\monodll_uiaction.obj \ @@ -2253,7 +2257,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_tbarbase.obj \ $(OBJS)\monodll_textcmn.obj \ $(OBJS)\monodll_textentrycmn.obj \ - $(OBJS)\monodll_textmeasurecmn.obj \ + $(OBJS)\monodll_textmeasurecmn.obj \ $(OBJS)\monodll_toplvcmn.obj \ $(OBJS)\monodll_treebase.obj \ $(OBJS)\monodll_uiactioncmn.obj \ @@ -2298,7 +2302,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_treectlg.obj \ $(OBJS)\monodll_treebkg.obj \ $(OBJS)\monodll_vlbox.obj \ - $(OBJS)\monodll_vscroll.obj + $(OBJS)\monodll_vscroll.obj \ + $(OBJS)\monodll_xmlreshandler.obj !endif !if "$(WXUNIV)" == "0" ____ADVANCED_SRC_FILENAMES_OBJECTS = \ @@ -2543,6 +2548,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_richtextstyles.obj \ $(OBJS)\monolib_richtextsymboldlg.obj \ $(OBJS)\monolib_richtextxml.obj \ + $(OBJS)\monolib_xh_richtext.obj \ $(OBJS)\monolib_stc.obj \ $(OBJS)\monolib_PlatWX.obj \ $(OBJS)\monolib_ScintillaWX.obj @@ -2591,7 +2597,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_region.obj \ $(OBJS)\monolib_renderer.obj \ $(OBJS)\monolib_settings.obj \ - $(OBJS)\monolib_textmeasure.obj \ + $(OBJS)\monolib_textmeasure.obj \ $(OBJS)\monolib_tooltip.obj \ $(OBJS)\monolib_toplevel.obj \ $(OBJS)\monolib_uiaction.obj \ @@ -2777,7 +2783,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_tbarbase.obj \ $(OBJS)\monolib_textcmn.obj \ $(OBJS)\monolib_textentrycmn.obj \ - $(OBJS)\monolib_textmeasurecmn.obj \ + $(OBJS)\monolib_textmeasurecmn.obj \ $(OBJS)\monolib_toplvcmn.obj \ $(OBJS)\monolib_treebase.obj \ $(OBJS)\monolib_uiactioncmn.obj \ @@ -2822,7 +2828,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_treectlg.obj \ $(OBJS)\monolib_treebkg.obj \ $(OBJS)\monolib_vlbox.obj \ - $(OBJS)\monolib_vscroll.obj + $(OBJS)\monolib_vscroll.obj \ + $(OBJS)\monolib_xmlreshandler.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" ____CORE_SRC_FILENAMES_1_OBJECTS = \ @@ -2868,7 +2875,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_region.obj \ $(OBJS)\monolib_renderer.obj \ $(OBJS)\monolib_settings.obj \ - $(OBJS)\monolib_textmeasure.obj \ + $(OBJS)\monolib_textmeasure.obj \ $(OBJS)\monolib_tooltip.obj \ $(OBJS)\monolib_toplevel.obj \ $(OBJS)\monolib_uiaction.obj \ @@ -3048,7 +3055,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_tbarbase.obj \ $(OBJS)\monolib_textcmn.obj \ $(OBJS)\monolib_textentrycmn.obj \ - $(OBJS)\monolib_textmeasurecmn.obj \ + $(OBJS)\monolib_textmeasurecmn.obj \ $(OBJS)\monolib_toplvcmn.obj \ $(OBJS)\monolib_treebase.obj \ $(OBJS)\monolib_uiactioncmn.obj \ @@ -3093,7 +3100,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_treectlg.obj \ $(OBJS)\monolib_treebkg.obj \ $(OBJS)\monolib_vlbox.obj \ - $(OBJS)\monolib_vscroll.obj + $(OBJS)\monolib_vscroll.obj \ + $(OBJS)\monolib_xmlreshandler.obj !endif !if "$(WXUNIV)" == "0" ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ @@ -3267,7 +3275,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_region.obj \ $(OBJS)\coredll_renderer.obj \ $(OBJS)\coredll_settings.obj \ - $(OBJS)\coredll_textmeasure.obj \ + $(OBJS)\coredll_textmeasure.obj \ $(OBJS)\coredll_tooltip.obj \ $(OBJS)\coredll_toplevel.obj \ $(OBJS)\coredll_uiaction.obj \ @@ -3453,7 +3461,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_tbarbase.obj \ $(OBJS)\coredll_textcmn.obj \ $(OBJS)\coredll_textentrycmn.obj \ - $(OBJS)\coredll_textmeasurecmn.obj \ + $(OBJS)\coredll_textmeasurecmn.obj \ $(OBJS)\coredll_toplvcmn.obj \ $(OBJS)\coredll_treebase.obj \ $(OBJS)\coredll_uiactioncmn.obj \ @@ -3498,7 +3506,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_treectlg.obj \ $(OBJS)\coredll_treebkg.obj \ $(OBJS)\coredll_vlbox.obj \ - $(OBJS)\coredll_vscroll.obj + $(OBJS)\coredll_vscroll.obj \ + $(OBJS)\coredll_xmlreshandler.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" ____CORE_SRC_FILENAMES_2_OBJECTS = \ @@ -3544,7 +3553,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_region.obj \ $(OBJS)\coredll_renderer.obj \ $(OBJS)\coredll_settings.obj \ - $(OBJS)\coredll_textmeasure.obj \ + $(OBJS)\coredll_textmeasure.obj \ $(OBJS)\coredll_tooltip.obj \ $(OBJS)\coredll_toplevel.obj \ $(OBJS)\coredll_uiaction.obj \ @@ -3724,7 +3733,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_tbarbase.obj \ $(OBJS)\coredll_textcmn.obj \ $(OBJS)\coredll_textentrycmn.obj \ - $(OBJS)\coredll_textmeasurecmn.obj \ + $(OBJS)\coredll_textmeasurecmn.obj \ $(OBJS)\coredll_toplvcmn.obj \ $(OBJS)\coredll_treebase.obj \ $(OBJS)\coredll_uiactioncmn.obj \ @@ -3769,7 +3778,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_treectlg.obj \ $(OBJS)\coredll_treebkg.obj \ $(OBJS)\coredll_vlbox.obj \ - $(OBJS)\coredll_vscroll.obj + $(OBJS)\coredll_vscroll.obj \ + $(OBJS)\coredll_xmlreshandler.obj !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" __corelib___depname = \ @@ -3819,7 +3829,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_region.obj \ $(OBJS)\corelib_renderer.obj \ $(OBJS)\corelib_settings.obj \ - $(OBJS)\corelib_textmeasure.obj \ + $(OBJS)\corelib_textmeasure.obj \ $(OBJS)\corelib_tooltip.obj \ $(OBJS)\corelib_toplevel.obj \ $(OBJS)\corelib_uiaction.obj \ @@ -4005,7 +4015,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_tbarbase.obj \ $(OBJS)\corelib_textcmn.obj \ $(OBJS)\corelib_textentrycmn.obj \ - $(OBJS)\corelib_textmeasurecmn.obj \ + $(OBJS)\corelib_textmeasurecmn.obj \ $(OBJS)\corelib_toplvcmn.obj \ $(OBJS)\corelib_treebase.obj \ $(OBJS)\corelib_uiactioncmn.obj \ @@ -4050,7 +4060,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_treectlg.obj \ $(OBJS)\corelib_treebkg.obj \ $(OBJS)\corelib_vlbox.obj \ - $(OBJS)\corelib_vscroll.obj + $(OBJS)\corelib_vscroll.obj \ + $(OBJS)\corelib_xmlreshandler.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" ____CORE_SRC_FILENAMES_3_OBJECTS = \ @@ -4096,7 +4107,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_region.obj \ $(OBJS)\corelib_renderer.obj \ $(OBJS)\corelib_settings.obj \ - $(OBJS)\corelib_textmeasure.obj \ + $(OBJS)\corelib_textmeasure.obj \ $(OBJS)\corelib_tooltip.obj \ $(OBJS)\corelib_toplevel.obj \ $(OBJS)\corelib_uiaction.obj \ @@ -4276,7 +4287,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_tbarbase.obj \ $(OBJS)\corelib_textcmn.obj \ $(OBJS)\corelib_textentrycmn.obj \ - $(OBJS)\corelib_textmeasurecmn.obj \ + $(OBJS)\corelib_textmeasurecmn.obj \ $(OBJS)\corelib_toplvcmn.obj \ $(OBJS)\corelib_treebase.obj \ $(OBJS)\corelib_uiactioncmn.obj \ @@ -4321,7 +4332,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_treectlg.obj \ $(OBJS)\corelib_treebkg.obj \ $(OBJS)\corelib_vlbox.obj \ - $(OBJS)\corelib_vscroll.obj + $(OBJS)\corelib_vscroll.obj \ + $(OBJS)\corelib_xmlreshandler.obj !endif !if "$(SHARED)" == "1" ____wxcore_namedll_DEP = $(__coredll___depname) @@ -7286,6 +7298,9 @@ $(OBJS)\monodll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp $(OBJS)\monodll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp +$(OBJS)\monodll_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp + $(OBJS)\monodll_stc.obj: ..\..\src\stc\stc.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\stc\stc.cpp @@ -7512,11 +7527,11 @@ $(OBJS)\monodll_settings.obj: ..\..\src\msw\settings.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_textmeasure.obj: ..\..\src\msw\textmeasure.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_textmeasure.obj: ..\..\src\msw\textmeasure.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monodll_tooltip.obj: ..\..\src\msw\tooltip.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tooltip.cpp !endif @@ -8172,11 +8187,11 @@ $(OBJS)\monodll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monodll_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monodll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\toplvcmn.cpp !endif @@ -8401,6 +8416,11 @@ $(OBJS)\monodll_vscroll.obj: ..\..\src\generic\vscroll.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\vscroll.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_animatecmn.obj: ..\..\src\common\animatecmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp @@ -9722,6 +9742,9 @@ $(OBJS)\monolib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp $(OBJS)\monolib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp +$(OBJS)\monolib_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp + $(OBJS)\monolib_stc.obj: ..\..\src\stc\stc.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\stc\stc.cpp @@ -9948,11 +9971,11 @@ $(OBJS)\monolib_settings.obj: ..\..\src\msw\settings.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_textmeasure.obj: ..\..\src\msw\textmeasure.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_textmeasure.obj: ..\..\src\msw\textmeasure.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monolib_tooltip.obj: ..\..\src\msw\tooltip.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tooltip.cpp !endif @@ -10608,11 +10631,11 @@ $(OBJS)\monolib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\monolib_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monolib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\toplvcmn.cpp !endif @@ -10837,6 +10860,11 @@ $(OBJS)\monolib_vscroll.obj: ..\..\src\generic\vscroll.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\vscroll.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_animatecmn.obj: ..\..\src\common\animatecmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp @@ -12348,11 +12376,11 @@ $(OBJS)\coredll_settings.obj: ..\..\src\msw\settings.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\coredll_textmeasure.obj: ..\..\src\msw\textmeasure.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_textmeasure.obj: ..\..\src\msw\textmeasure.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\coredll_tooltip.obj: ..\..\src\msw\tooltip.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tooltip.cpp !endif @@ -13008,11 +13036,11 @@ $(OBJS)\coredll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\coredll_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\coredll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\toplvcmn.cpp !endif @@ -13237,6 +13265,11 @@ $(OBJS)\coredll_vscroll.obj: ..\..\src\generic\vscroll.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\vscroll.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp +!endif + $(OBJS)\corelib_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp @@ -13778,11 +13811,11 @@ $(OBJS)\corelib_settings.obj: ..\..\src\msw\settings.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\corelib_textmeasure.obj: ..\..\src\msw\textmeasure.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_textmeasure.obj: ..\..\src\msw\textmeasure.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\corelib_tooltip.obj: ..\..\src\msw\tooltip.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tooltip.cpp !endif @@ -14438,11 +14471,11 @@ $(OBJS)\corelib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp !endif !if "$(USE_GUI)" == "1" -$(OBJS)\corelib_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\corelib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\toplvcmn.cpp !endif @@ -14667,6 +14700,11 @@ $(OBJS)\corelib_vscroll.obj: ..\..\src\generic\vscroll.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\vscroll.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp +!endif + $(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp @@ -15855,6 +15893,9 @@ $(OBJS)\richtextdll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg. $(OBJS)\richtextdll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp +$(OBJS)\richtextdll_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp + $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp + $(OBJS)\richtextlib_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp @@ -15888,6 +15929,9 @@ $(OBJS)\richtextlib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg. $(OBJS)\richtextlib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp +$(OBJS)\richtextlib_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp + $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp + $(OBJS)\stcdll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 80c4ad14de..573ede50e8 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1467,7 +1467,8 @@ RICHTEXTDLL_OBJECTS = \ $(OBJS)\richtextdll_richtextstyledlg.o \ $(OBJS)\richtextdll_richtextstyles.o \ $(OBJS)\richtextdll_richtextsymboldlg.o \ - $(OBJS)\richtextdll_richtextxml.o + $(OBJS)\richtextdll_richtextxml.o \ + $(OBJS)\richtextdll_xh_richtext.o RICHTEXTLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ @@ -1488,7 +1489,8 @@ RICHTEXTLIB_OBJECTS = \ $(OBJS)\richtextlib_richtextstyledlg.o \ $(OBJS)\richtextlib_richtextstyles.o \ $(OBJS)\richtextlib_richtextsymboldlg.o \ - $(OBJS)\richtextlib_richtextxml.o + $(OBJS)\richtextlib_richtextxml.o \ + $(OBJS)\richtextlib_xh_richtext.o STCDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ @@ -1760,6 +1762,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_richtextstyles.o \ $(OBJS)\monodll_richtextsymboldlg.o \ $(OBJS)\monodll_richtextxml.o \ + $(OBJS)\monodll_xh_richtext.o \ $(OBJS)\monodll_stc.o \ $(OBJS)\monodll_PlatWX.o \ $(OBJS)\monodll_ScintillaWX.o @@ -1809,7 +1812,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_region.o \ $(OBJS)\monodll_renderer.o \ $(OBJS)\monodll_settings.o \ - $(OBJS)\monodll_textmeasure.o \ + $(OBJS)\monodll_textmeasure.o \ $(OBJS)\monodll_tooltip.o \ $(OBJS)\monodll_toplevel.o \ $(OBJS)\monodll_uiaction.o \ @@ -1995,7 +1998,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_tbarbase.o \ $(OBJS)\monodll_textcmn.o \ $(OBJS)\monodll_textentrycmn.o \ - $(OBJS)\monodll_textmeasurecmn.o \ + $(OBJS)\monodll_textmeasurecmn.o \ $(OBJS)\monodll_toplvcmn.o \ $(OBJS)\monodll_treebase.o \ $(OBJS)\monodll_uiactioncmn.o \ @@ -2040,7 +2043,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_treectlg.o \ $(OBJS)\monodll_treebkg.o \ $(OBJS)\monodll_vlbox.o \ - $(OBJS)\monodll_vscroll.o + $(OBJS)\monodll_vscroll.o \ + $(OBJS)\monodll_xmlreshandler.o endif endif ifeq ($(USE_GUI),1) @@ -2088,7 +2092,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_region.o \ $(OBJS)\monodll_renderer.o \ $(OBJS)\monodll_settings.o \ - $(OBJS)\monodll_textmeasure.o \ + $(OBJS)\monodll_textmeasure.o \ $(OBJS)\monodll_tooltip.o \ $(OBJS)\monodll_toplevel.o \ $(OBJS)\monodll_uiaction.o \ @@ -2268,7 +2272,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_tbarbase.o \ $(OBJS)\monodll_textcmn.o \ $(OBJS)\monodll_textentrycmn.o \ - $(OBJS)\monodll_textmeasurecmn.o \ + $(OBJS)\monodll_textmeasurecmn.o \ $(OBJS)\monodll_toplvcmn.o \ $(OBJS)\monodll_treebase.o \ $(OBJS)\monodll_uiactioncmn.o \ @@ -2313,7 +2317,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_treectlg.o \ $(OBJS)\monodll_treebkg.o \ $(OBJS)\monodll_vlbox.o \ - $(OBJS)\monodll_vscroll.o + $(OBJS)\monodll_vscroll.o \ + $(OBJS)\monodll_xmlreshandler.o endif endif ifeq ($(WXUNIV),0) @@ -2561,6 +2566,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_richtextstyles.o \ $(OBJS)\monolib_richtextsymboldlg.o \ $(OBJS)\monolib_richtextxml.o \ + $(OBJS)\monolib_xh_richtext.o \ $(OBJS)\monolib_stc.o \ $(OBJS)\monolib_PlatWX.o \ $(OBJS)\monolib_ScintillaWX.o @@ -2610,7 +2616,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_region.o \ $(OBJS)\monolib_renderer.o \ $(OBJS)\monolib_settings.o \ - $(OBJS)\monolib_textmeasure.o \ + $(OBJS)\monolib_textmeasure.o \ $(OBJS)\monolib_tooltip.o \ $(OBJS)\monolib_toplevel.o \ $(OBJS)\monolib_uiaction.o \ @@ -2796,7 +2802,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_tbarbase.o \ $(OBJS)\monolib_textcmn.o \ $(OBJS)\monolib_textentrycmn.o \ - $(OBJS)\monolib_textmeasurecmn.o \ + $(OBJS)\monolib_textmeasurecmn.o \ $(OBJS)\monolib_toplvcmn.o \ $(OBJS)\monolib_treebase.o \ $(OBJS)\monolib_uiactioncmn.o \ @@ -2841,7 +2847,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_treectlg.o \ $(OBJS)\monolib_treebkg.o \ $(OBJS)\monolib_vlbox.o \ - $(OBJS)\monolib_vscroll.o + $(OBJS)\monolib_vscroll.o \ + $(OBJS)\monolib_xmlreshandler.o endif endif ifeq ($(USE_GUI),1) @@ -2889,7 +2896,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_region.o \ $(OBJS)\monolib_renderer.o \ $(OBJS)\monolib_settings.o \ - $(OBJS)\monolib_textmeasure.o \ + $(OBJS)\monolib_textmeasure.o \ $(OBJS)\monolib_tooltip.o \ $(OBJS)\monolib_toplevel.o \ $(OBJS)\monolib_uiaction.o \ @@ -3069,7 +3076,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_tbarbase.o \ $(OBJS)\monolib_textcmn.o \ $(OBJS)\monolib_textentrycmn.o \ - $(OBJS)\monolib_textmeasurecmn.o \ + $(OBJS)\monolib_textmeasurecmn.o \ $(OBJS)\monolib_toplvcmn.o \ $(OBJS)\monolib_treebase.o \ $(OBJS)\monolib_uiactioncmn.o \ @@ -3114,7 +3121,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_treectlg.o \ $(OBJS)\monolib_treebkg.o \ $(OBJS)\monolib_vlbox.o \ - $(OBJS)\monolib_vscroll.o + $(OBJS)\monolib_vscroll.o \ + $(OBJS)\monolib_xmlreshandler.o endif endif ifeq ($(WXUNIV),0) @@ -3302,7 +3310,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_region.o \ $(OBJS)\coredll_renderer.o \ $(OBJS)\coredll_settings.o \ - $(OBJS)\coredll_textmeasure.o \ + $(OBJS)\coredll_textmeasure.o \ $(OBJS)\coredll_tooltip.o \ $(OBJS)\coredll_toplevel.o \ $(OBJS)\coredll_uiaction.o \ @@ -3488,7 +3496,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_tbarbase.o \ $(OBJS)\coredll_textcmn.o \ $(OBJS)\coredll_textentrycmn.o \ - $(OBJS)\coredll_textmeasurecmn.o \ + $(OBJS)\coredll_textmeasurecmn.o \ $(OBJS)\coredll_toplvcmn.o \ $(OBJS)\coredll_treebase.o \ $(OBJS)\coredll_uiactioncmn.o \ @@ -3533,7 +3541,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_treectlg.o \ $(OBJS)\coredll_treebkg.o \ $(OBJS)\coredll_vlbox.o \ - $(OBJS)\coredll_vscroll.o + $(OBJS)\coredll_vscroll.o \ + $(OBJS)\coredll_xmlreshandler.o endif endif ifeq ($(USE_GUI),1) @@ -3581,7 +3590,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_region.o \ $(OBJS)\coredll_renderer.o \ $(OBJS)\coredll_settings.o \ - $(OBJS)\coredll_textmeasure.o \ + $(OBJS)\coredll_textmeasure.o \ $(OBJS)\coredll_tooltip.o \ $(OBJS)\coredll_toplevel.o \ $(OBJS)\coredll_uiaction.o \ @@ -3761,7 +3770,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_tbarbase.o \ $(OBJS)\coredll_textcmn.o \ $(OBJS)\coredll_textentrycmn.o \ - $(OBJS)\coredll_textmeasurecmn.o \ + $(OBJS)\coredll_textmeasurecmn.o \ $(OBJS)\coredll_toplvcmn.o \ $(OBJS)\coredll_treebase.o \ $(OBJS)\coredll_uiactioncmn.o \ @@ -3806,7 +3815,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_treectlg.o \ $(OBJS)\coredll_treebkg.o \ $(OBJS)\coredll_vlbox.o \ - $(OBJS)\coredll_vscroll.o + $(OBJS)\coredll_vscroll.o \ + $(OBJS)\coredll_xmlreshandler.o endif endif ifeq ($(MONOLITHIC),0) @@ -3862,7 +3872,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_region.o \ $(OBJS)\corelib_renderer.o \ $(OBJS)\corelib_settings.o \ - $(OBJS)\corelib_textmeasure.o \ + $(OBJS)\corelib_textmeasure.o \ $(OBJS)\corelib_tooltip.o \ $(OBJS)\corelib_toplevel.o \ $(OBJS)\corelib_uiaction.o \ @@ -4048,7 +4058,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_tbarbase.o \ $(OBJS)\corelib_textcmn.o \ $(OBJS)\corelib_textentrycmn.o \ - $(OBJS)\corelib_textmeasurecmn.o \ + $(OBJS)\corelib_textmeasurecmn.o \ $(OBJS)\corelib_toplvcmn.o \ $(OBJS)\corelib_treebase.o \ $(OBJS)\corelib_uiactioncmn.o \ @@ -4093,7 +4103,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_treectlg.o \ $(OBJS)\corelib_treebkg.o \ $(OBJS)\corelib_vlbox.o \ - $(OBJS)\corelib_vscroll.o + $(OBJS)\corelib_vscroll.o \ + $(OBJS)\corelib_xmlreshandler.o endif endif ifeq ($(USE_GUI),1) @@ -4141,7 +4152,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_region.o \ $(OBJS)\corelib_renderer.o \ $(OBJS)\corelib_settings.o \ - $(OBJS)\corelib_textmeasure.o \ + $(OBJS)\corelib_textmeasure.o \ $(OBJS)\corelib_tooltip.o \ $(OBJS)\corelib_toplevel.o \ $(OBJS)\corelib_uiaction.o \ @@ -4321,7 +4332,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_tbarbase.o \ $(OBJS)\corelib_textcmn.o \ $(OBJS)\corelib_textentrycmn.o \ - $(OBJS)\corelib_textmeasurecmn.o \ + $(OBJS)\corelib_textmeasurecmn.o \ $(OBJS)\corelib_toplvcmn.o \ $(OBJS)\corelib_treebase.o \ $(OBJS)\corelib_uiactioncmn.o \ @@ -4366,7 +4377,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_treectlg.o \ $(OBJS)\corelib_treebkg.o \ $(OBJS)\corelib_vlbox.o \ - $(OBJS)\corelib_vscroll.o + $(OBJS)\corelib_vscroll.o \ + $(OBJS)\corelib_xmlreshandler.o endif endif ifeq ($(SHARED),1) @@ -7455,6 +7467,9 @@ $(OBJS)\monodll_richtextsymboldlg.o: ../../src/richtext/richtextsymboldlg.cpp $(OBJS)\monodll_richtextxml.o: ../../src/richtext/richtextxml.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monodll_xh_richtext.o: ../../src/xrc/xh_richtext.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_stc.o: ../../src/stc/stc.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -7681,11 +7696,11 @@ $(OBJS)\monodll_settings.o: ../../src/msw/settings.cpp endif ifeq ($(USE_GUI),1) -$(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 + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\monodll_tooltip.o: ../../src/msw/tooltip.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif @@ -8341,11 +8356,11 @@ $(OBJS)\monodll_textentrycmn.o: ../../src/common/textentrycmn.cpp endif ifeq ($(USE_GUI),1) -$(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 + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\monodll_toplvcmn.o: ../../src/common/toplvcmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif @@ -8570,6 +8585,11 @@ $(OBJS)\monodll_vscroll.o: ../../src/generic/vscroll.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_xmlreshandler.o: ../../src/xrc/xmlreshandler.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_animatecmn.o: ../../src/common/animatecmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -9891,6 +9911,9 @@ $(OBJS)\monolib_richtextsymboldlg.o: ../../src/richtext/richtextsymboldlg.cpp $(OBJS)\monolib_richtextxml.o: ../../src/richtext/richtextxml.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monolib_xh_richtext.o: ../../src/xrc/xh_richtext.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_stc.o: ../../src/stc/stc.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -10117,11 +10140,11 @@ $(OBJS)\monolib_settings.o: ../../src/msw/settings.cpp endif ifeq ($(USE_GUI),1) -$(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 + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\monolib_tooltip.o: ../../src/msw/tooltip.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif @@ -10777,11 +10800,11 @@ $(OBJS)\monolib_textentrycmn.o: ../../src/common/textentrycmn.cpp endif ifeq ($(USE_GUI),1) -$(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 + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\monolib_toplvcmn.o: ../../src/common/toplvcmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif @@ -11006,6 +11029,11 @@ $(OBJS)\monolib_vscroll.o: ../../src/generic/vscroll.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_xmlreshandler.o: ../../src/xrc/xmlreshandler.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_animatecmn.o: ../../src/common/animatecmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -12517,11 +12545,11 @@ $(OBJS)\coredll_settings.o: ../../src/msw/settings.cpp endif ifeq ($(USE_GUI),1) -$(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 + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\coredll_tooltip.o: ../../src/msw/tooltip.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif @@ -13177,11 +13205,11 @@ $(OBJS)\coredll_textentrycmn.o: ../../src/common/textentrycmn.cpp endif ifeq ($(USE_GUI),1) -$(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 + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\coredll_toplvcmn.o: ../../src/common/toplvcmn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif @@ -13406,6 +13434,11 @@ $(OBJS)\coredll_vscroll.o: ../../src/generic/vscroll.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_xmlreshandler.o: ../../src/xrc/xmlreshandler.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + $(OBJS)\corelib_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -13947,11 +13980,11 @@ $(OBJS)\corelib_settings.o: ../../src/msw/settings.cpp endif ifeq ($(USE_GUI),1) -$(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 + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\corelib_tooltip.o: ../../src/msw/tooltip.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif @@ -14607,11 +14640,11 @@ $(OBJS)\corelib_textentrycmn.o: ../../src/common/textentrycmn.cpp endif ifeq ($(USE_GUI),1) -$(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 + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) $(OBJS)\corelib_toplvcmn.o: ../../src/common/toplvcmn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif @@ -14836,6 +14869,11 @@ $(OBJS)\corelib_vscroll.o: ../../src/generic/vscroll.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_xmlreshandler.o: ../../src/xrc/xmlreshandler.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + $(OBJS)\advdll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< @@ -16024,6 +16062,9 @@ $(OBJS)\richtextdll_richtextsymboldlg.o: ../../src/richtext/richtextsymboldlg.cp $(OBJS)\richtextdll_richtextxml.o: ../../src/richtext/richtextxml.cpp $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\richtextdll_xh_richtext.o: ../../src/xrc/xh_richtext.cpp + $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\richtextlib_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $< @@ -16057,6 +16098,9 @@ $(OBJS)\richtextlib_richtextsymboldlg.o: ../../src/richtext/richtextsymboldlg.cp $(OBJS)\richtextlib_richtextxml.o: ../../src/richtext/richtextxml.cpp $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\richtextlib_xh_richtext.o: ../../src/xrc/xh_richtext.cpp + $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\stcdll_dummy.o: ../../src/common/dummy.cpp $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $(CPPDEPS) $< diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 8951e51d02..20877a77d6 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -1630,7 +1630,8 @@ RICHTEXTDLL_OBJECTS = \ $(OBJS)\richtextdll_richtextstyledlg.obj \ $(OBJS)\richtextdll_richtextstyles.obj \ $(OBJS)\richtextdll_richtextsymboldlg.obj \ - $(OBJS)\richtextdll_richtextxml.obj + $(OBJS)\richtextdll_richtextxml.obj \ + $(OBJS)\richtextdll_xh_richtext.obj RICHTEXTDLL_RESOURCES = \ $(OBJS)\richtextdll_version.res RICHTEXTLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_565)$(__DEBUGRUNTIME) /DWIN32 \ @@ -1657,7 +1658,8 @@ RICHTEXTLIB_OBJECTS = \ $(OBJS)\richtextlib_richtextstyledlg.obj \ $(OBJS)\richtextlib_richtextstyles.obj \ $(OBJS)\richtextlib_richtextsymboldlg.obj \ - $(OBJS)\richtextlib_richtextxml.obj + $(OBJS)\richtextlib_richtextxml.obj \ + $(OBJS)\richtextlib_xh_richtext.obj STCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_581)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).pdb \ @@ -2040,6 +2042,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_richtextstyles.obj \ $(OBJS)\monodll_richtextsymboldlg.obj \ $(OBJS)\monodll_richtextxml.obj \ + $(OBJS)\monodll_xh_richtext.obj \ $(OBJS)\monodll_stc.obj \ $(OBJS)\monodll_PlatWX.obj \ $(OBJS)\monodll_ScintillaWX.obj @@ -2088,7 +2091,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_region.obj \ $(OBJS)\monodll_renderer.obj \ $(OBJS)\monodll_settings.obj \ - $(OBJS)\monodll_textmeasure.obj \ + $(OBJS)\monodll_textmeasure.obj \ $(OBJS)\monodll_tooltip.obj \ $(OBJS)\monodll_toplevel.obj \ $(OBJS)\monodll_uiaction.obj \ @@ -2274,7 +2277,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_tbarbase.obj \ $(OBJS)\monodll_textcmn.obj \ $(OBJS)\monodll_textentrycmn.obj \ - $(OBJS)\monodll_textmeasurecmn.obj \ + $(OBJS)\monodll_textmeasurecmn.obj \ $(OBJS)\monodll_toplvcmn.obj \ $(OBJS)\monodll_treebase.obj \ $(OBJS)\monodll_uiactioncmn.obj \ @@ -2319,7 +2322,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_treectlg.obj \ $(OBJS)\monodll_treebkg.obj \ $(OBJS)\monodll_vlbox.obj \ - $(OBJS)\monodll_vscroll.obj + $(OBJS)\monodll_vscroll.obj \ + $(OBJS)\monodll_xmlreshandler.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" ____CORE_SRC_FILENAMES_OBJECTS = \ @@ -2365,7 +2369,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_region.obj \ $(OBJS)\monodll_renderer.obj \ $(OBJS)\monodll_settings.obj \ - $(OBJS)\monodll_textmeasure.obj \ + $(OBJS)\monodll_textmeasure.obj \ $(OBJS)\monodll_tooltip.obj \ $(OBJS)\monodll_toplevel.obj \ $(OBJS)\monodll_uiaction.obj \ @@ -2545,7 +2549,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_tbarbase.obj \ $(OBJS)\monodll_textcmn.obj \ $(OBJS)\monodll_textentrycmn.obj \ - $(OBJS)\monodll_textmeasurecmn.obj \ + $(OBJS)\monodll_textmeasurecmn.obj \ $(OBJS)\monodll_toplvcmn.obj \ $(OBJS)\monodll_treebase.obj \ $(OBJS)\monodll_uiactioncmn.obj \ @@ -2590,7 +2594,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_treectlg.obj \ $(OBJS)\monodll_treebkg.obj \ $(OBJS)\monodll_vlbox.obj \ - $(OBJS)\monodll_vscroll.obj + $(OBJS)\monodll_vscroll.obj \ + $(OBJS)\monodll_xmlreshandler.obj !endif !if "$(WXUNIV)" == "0" ____ADVANCED_SRC_FILENAMES_OBJECTS = \ @@ -2841,6 +2846,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_richtextstyles.obj \ $(OBJS)\monolib_richtextsymboldlg.obj \ $(OBJS)\monolib_richtextxml.obj \ + $(OBJS)\monolib_xh_richtext.obj \ $(OBJS)\monolib_stc.obj \ $(OBJS)\monolib_PlatWX.obj \ $(OBJS)\monolib_ScintillaWX.obj @@ -2889,7 +2895,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_region.obj \ $(OBJS)\monolib_renderer.obj \ $(OBJS)\monolib_settings.obj \ - $(OBJS)\monolib_textmeasure.obj \ + $(OBJS)\monolib_textmeasure.obj \ $(OBJS)\monolib_tooltip.obj \ $(OBJS)\monolib_toplevel.obj \ $(OBJS)\monolib_uiaction.obj \ @@ -3075,7 +3081,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_tbarbase.obj \ $(OBJS)\monolib_textcmn.obj \ $(OBJS)\monolib_textentrycmn.obj \ - $(OBJS)\monolib_textmeasurecmn.obj \ + $(OBJS)\monolib_textmeasurecmn.obj \ $(OBJS)\monolib_toplvcmn.obj \ $(OBJS)\monolib_treebase.obj \ $(OBJS)\monolib_uiactioncmn.obj \ @@ -3120,7 +3126,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_treectlg.obj \ $(OBJS)\monolib_treebkg.obj \ $(OBJS)\monolib_vlbox.obj \ - $(OBJS)\monolib_vscroll.obj + $(OBJS)\monolib_vscroll.obj \ + $(OBJS)\monolib_xmlreshandler.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" ____CORE_SRC_FILENAMES_1_OBJECTS = \ @@ -3166,7 +3173,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_region.obj \ $(OBJS)\monolib_renderer.obj \ $(OBJS)\monolib_settings.obj \ - $(OBJS)\monolib_textmeasure.obj \ + $(OBJS)\monolib_textmeasure.obj \ $(OBJS)\monolib_tooltip.obj \ $(OBJS)\monolib_toplevel.obj \ $(OBJS)\monolib_uiaction.obj \ @@ -3346,7 +3353,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_tbarbase.obj \ $(OBJS)\monolib_textcmn.obj \ $(OBJS)\monolib_textentrycmn.obj \ - $(OBJS)\monolib_textmeasurecmn.obj \ + $(OBJS)\monolib_textmeasurecmn.obj \ $(OBJS)\monolib_toplvcmn.obj \ $(OBJS)\monolib_treebase.obj \ $(OBJS)\monolib_uiactioncmn.obj \ @@ -3391,7 +3398,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_treectlg.obj \ $(OBJS)\monolib_treebkg.obj \ $(OBJS)\monolib_vlbox.obj \ - $(OBJS)\monolib_vscroll.obj + $(OBJS)\monolib_vscroll.obj \ + $(OBJS)\monolib_xmlreshandler.obj !endif !if "$(WXUNIV)" == "0" ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ @@ -3631,7 +3639,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_region.obj \ $(OBJS)\coredll_renderer.obj \ $(OBJS)\coredll_settings.obj \ - $(OBJS)\coredll_textmeasure.obj \ + $(OBJS)\coredll_textmeasure.obj \ $(OBJS)\coredll_tooltip.obj \ $(OBJS)\coredll_toplevel.obj \ $(OBJS)\coredll_uiaction.obj \ @@ -3817,7 +3825,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_tbarbase.obj \ $(OBJS)\coredll_textcmn.obj \ $(OBJS)\coredll_textentrycmn.obj \ - $(OBJS)\coredll_textmeasurecmn.obj \ + $(OBJS)\coredll_textmeasurecmn.obj \ $(OBJS)\coredll_toplvcmn.obj \ $(OBJS)\coredll_treebase.obj \ $(OBJS)\coredll_uiactioncmn.obj \ @@ -3862,7 +3870,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_treectlg.obj \ $(OBJS)\coredll_treebkg.obj \ $(OBJS)\coredll_vlbox.obj \ - $(OBJS)\coredll_vscroll.obj + $(OBJS)\coredll_vscroll.obj \ + $(OBJS)\coredll_xmlreshandler.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" ____CORE_SRC_FILENAMES_2_OBJECTS = \ @@ -3908,7 +3917,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_region.obj \ $(OBJS)\coredll_renderer.obj \ $(OBJS)\coredll_settings.obj \ - $(OBJS)\coredll_textmeasure.obj \ + $(OBJS)\coredll_textmeasure.obj \ $(OBJS)\coredll_tooltip.obj \ $(OBJS)\coredll_toplevel.obj \ $(OBJS)\coredll_uiaction.obj \ @@ -4088,7 +4097,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_tbarbase.obj \ $(OBJS)\coredll_textcmn.obj \ $(OBJS)\coredll_textentrycmn.obj \ - $(OBJS)\coredll_textmeasurecmn.obj \ + $(OBJS)\coredll_textmeasurecmn.obj \ $(OBJS)\coredll_toplvcmn.obj \ $(OBJS)\coredll_treebase.obj \ $(OBJS)\coredll_uiactioncmn.obj \ @@ -4133,7 +4142,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_treectlg.obj \ $(OBJS)\coredll_treebkg.obj \ $(OBJS)\coredll_vlbox.obj \ - $(OBJS)\coredll_vscroll.obj + $(OBJS)\coredll_vscroll.obj \ + $(OBJS)\coredll_xmlreshandler.obj !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" __corelib___depname = \ @@ -4189,7 +4199,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_region.obj \ $(OBJS)\corelib_renderer.obj \ $(OBJS)\corelib_settings.obj \ - $(OBJS)\corelib_textmeasure.obj \ + $(OBJS)\corelib_textmeasure.obj \ $(OBJS)\corelib_tooltip.obj \ $(OBJS)\corelib_toplevel.obj \ $(OBJS)\corelib_uiaction.obj \ @@ -4375,7 +4385,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_tbarbase.obj \ $(OBJS)\corelib_textcmn.obj \ $(OBJS)\corelib_textentrycmn.obj \ - $(OBJS)\corelib_textmeasurecmn.obj \ + $(OBJS)\corelib_textmeasurecmn.obj \ $(OBJS)\corelib_toplvcmn.obj \ $(OBJS)\corelib_treebase.obj \ $(OBJS)\corelib_uiactioncmn.obj \ @@ -4420,7 +4430,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_treectlg.obj \ $(OBJS)\corelib_treebkg.obj \ $(OBJS)\corelib_vlbox.obj \ - $(OBJS)\corelib_vscroll.obj + $(OBJS)\corelib_vscroll.obj \ + $(OBJS)\corelib_xmlreshandler.obj !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" ____CORE_SRC_FILENAMES_3_OBJECTS = \ @@ -4466,7 +4477,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_region.obj \ $(OBJS)\corelib_renderer.obj \ $(OBJS)\corelib_settings.obj \ - $(OBJS)\corelib_textmeasure.obj \ + $(OBJS)\corelib_textmeasure.obj \ $(OBJS)\corelib_tooltip.obj \ $(OBJS)\corelib_toplevel.obj \ $(OBJS)\corelib_uiaction.obj \ @@ -4646,7 +4657,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_tbarbase.obj \ $(OBJS)\corelib_textcmn.obj \ $(OBJS)\corelib_textentrycmn.obj \ - $(OBJS)\corelib_textmeasurecmn.obj \ + $(OBJS)\corelib_textmeasurecmn.obj \ $(OBJS)\corelib_toplvcmn.obj \ $(OBJS)\corelib_treebase.obj \ $(OBJS)\corelib_uiactioncmn.obj \ @@ -4691,7 +4702,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_treectlg.obj \ $(OBJS)\corelib_treebkg.obj \ $(OBJS)\corelib_vlbox.obj \ - $(OBJS)\corelib_vscroll.obj + $(OBJS)\corelib_vscroll.obj \ + $(OBJS)\corelib_xmlreshandler.obj !endif !if "$(SHARED)" == "1" ____wxcore_namedll_DEP = $(__coredll___depname) @@ -7970,6 +7982,9 @@ $(OBJS)\monodll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp $(OBJS)\monodll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp +$(OBJS)\monodll_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp + $(OBJS)\monodll_stc.obj: ..\..\src\stc\stc.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\stc\stc.cpp @@ -8196,11 +8211,11 @@ $(OBJS)\monodll_settings.obj: ..\..\src\msw\settings.cpp !endif !if "$(USE_GUI)" == "1" -$(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 + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monodll_tooltip.obj: ..\..\src\msw\tooltip.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tooltip.cpp !endif @@ -8856,11 +8871,11 @@ $(OBJS)\monodll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp !endif !if "$(USE_GUI)" == "1" -$(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 + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monodll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\toplvcmn.cpp !endif @@ -9085,6 +9100,11 @@ $(OBJS)\monodll_vscroll.obj: ..\..\src\generic\vscroll.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\vscroll.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_animatecmn.obj: ..\..\src\common\animatecmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp @@ -10406,6 +10426,9 @@ $(OBJS)\monolib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp $(OBJS)\monolib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp +$(OBJS)\monolib_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp + $(OBJS)\monolib_stc.obj: ..\..\src\stc\stc.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\stc\stc.cpp @@ -10632,11 +10655,11 @@ $(OBJS)\monolib_settings.obj: ..\..\src\msw\settings.cpp !endif !if "$(USE_GUI)" == "1" -$(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 + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monolib_tooltip.obj: ..\..\src\msw\tooltip.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tooltip.cpp !endif @@ -11292,11 +11315,11 @@ $(OBJS)\monolib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp !endif !if "$(USE_GUI)" == "1" -$(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 + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\monolib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\toplvcmn.cpp !endif @@ -11521,6 +11544,11 @@ $(OBJS)\monolib_vscroll.obj: ..\..\src\generic\vscroll.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\vscroll.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_animatecmn.obj: ..\..\src\common\animatecmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp @@ -13032,11 +13060,11 @@ $(OBJS)\coredll_settings.obj: ..\..\src\msw\settings.cpp !endif !if "$(USE_GUI)" == "1" -$(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 + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\coredll_tooltip.obj: ..\..\src\msw\tooltip.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tooltip.cpp !endif @@ -13692,11 +13720,11 @@ $(OBJS)\coredll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp !endif !if "$(USE_GUI)" == "1" -$(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 + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\coredll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\toplvcmn.cpp !endif @@ -13921,6 +13949,11 @@ $(OBJS)\coredll_vscroll.obj: ..\..\src\generic\vscroll.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\vscroll.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp +!endif + $(OBJS)\corelib_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp @@ -14462,11 +14495,11 @@ $(OBJS)\corelib_settings.obj: ..\..\src\msw\settings.cpp !endif !if "$(USE_GUI)" == "1" -$(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 + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\corelib_tooltip.obj: ..\..\src\msw\tooltip.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tooltip.cpp !endif @@ -15122,11 +15155,11 @@ $(OBJS)\corelib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp !endif !if "$(USE_GUI)" == "1" -$(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 + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp +!endif + +!if "$(USE_GUI)" == "1" $(OBJS)\corelib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\toplvcmn.cpp !endif @@ -15351,6 +15384,11 @@ $(OBJS)\corelib_vscroll.obj: ..\..\src\generic\vscroll.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\vscroll.cpp !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp +!endif + $(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp @@ -16539,6 +16577,9 @@ $(OBJS)\richtextdll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg. $(OBJS)\richtextdll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp +$(OBJS)\richtextdll_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp + $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp + $(OBJS)\richtextlib_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp @@ -16572,6 +16613,9 @@ $(OBJS)\richtextlib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg. $(OBJS)\richtextlib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp +$(OBJS)\richtextlib_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp + $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp + $(OBJS)\stcdll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index be05670d88..daf9e756e8 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -252,6 +252,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_richtextstyles.obj & $(OBJS)\monodll_richtextsymboldlg.obj & $(OBJS)\monodll_richtextxml.obj & + $(OBJS)\monodll_xh_richtext.obj & $(OBJS)\monodll_stc.obj & $(OBJS)\monodll_PlatWX.obj & $(OBJS)\monodll_ScintillaWX.obj @@ -302,7 +303,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_region.obj & $(OBJS)\monodll_renderer.obj & $(OBJS)\monodll_settings.obj & - $(OBJS)\monodll_textmeasure.obj & + $(OBJS)\monodll_textmeasure.obj & $(OBJS)\monodll_tooltip.obj & $(OBJS)\monodll_toplevel.obj & $(OBJS)\monodll_uiaction.obj & @@ -488,7 +489,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_tbarbase.obj & $(OBJS)\monodll_textcmn.obj & $(OBJS)\monodll_textentrycmn.obj & - $(OBJS)\monodll_textmeasurecmn.obj & + $(OBJS)\monodll_textmeasurecmn.obj & $(OBJS)\monodll_toplvcmn.obj & $(OBJS)\monodll_treebase.obj & $(OBJS)\monodll_uiactioncmn.obj & @@ -533,7 +534,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_treectlg.obj & $(OBJS)\monodll_treebkg.obj & $(OBJS)\monodll_vlbox.obj & - $(OBJS)\monodll_vscroll.obj + $(OBJS)\monodll_vscroll.obj & + $(OBJS)\monodll_xmlreshandler.obj !endif !endif !ifeq USE_GUI 1 @@ -581,7 +583,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_region.obj & $(OBJS)\monodll_renderer.obj & $(OBJS)\monodll_settings.obj & - $(OBJS)\monodll_textmeasure.obj & + $(OBJS)\monodll_textmeasure.obj & $(OBJS)\monodll_tooltip.obj & $(OBJS)\monodll_toplevel.obj & $(OBJS)\monodll_uiaction.obj & @@ -761,7 +763,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_tbarbase.obj & $(OBJS)\monodll_textcmn.obj & $(OBJS)\monodll_textentrycmn.obj & - $(OBJS)\monodll_textmeasurecmn.obj & + $(OBJS)\monodll_textmeasurecmn.obj & $(OBJS)\monodll_toplvcmn.obj & $(OBJS)\monodll_treebase.obj & $(OBJS)\monodll_uiactioncmn.obj & @@ -806,7 +808,8 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_treectlg.obj & $(OBJS)\monodll_treebkg.obj & $(OBJS)\monodll_vlbox.obj & - $(OBJS)\monodll_vscroll.obj + $(OBJS)\monodll_vscroll.obj & + $(OBJS)\monodll_xmlreshandler.obj !endif !endif ____ADVANCED_SRC_FILENAMES_OBJECTS = @@ -1058,6 +1061,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_richtextstyles.obj & $(OBJS)\monolib_richtextsymboldlg.obj & $(OBJS)\monolib_richtextxml.obj & + $(OBJS)\monolib_xh_richtext.obj & $(OBJS)\monolib_stc.obj & $(OBJS)\monolib_PlatWX.obj & $(OBJS)\monolib_ScintillaWX.obj @@ -1108,7 +1112,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_region.obj & $(OBJS)\monolib_renderer.obj & $(OBJS)\monolib_settings.obj & - $(OBJS)\monolib_textmeasure.obj & + $(OBJS)\monolib_textmeasure.obj & $(OBJS)\monolib_tooltip.obj & $(OBJS)\monolib_toplevel.obj & $(OBJS)\monolib_uiaction.obj & @@ -1294,7 +1298,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_tbarbase.obj & $(OBJS)\monolib_textcmn.obj & $(OBJS)\monolib_textentrycmn.obj & - $(OBJS)\monolib_textmeasurecmn.obj & + $(OBJS)\monolib_textmeasurecmn.obj & $(OBJS)\monolib_toplvcmn.obj & $(OBJS)\monolib_treebase.obj & $(OBJS)\monolib_uiactioncmn.obj & @@ -1339,7 +1343,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_treectlg.obj & $(OBJS)\monolib_treebkg.obj & $(OBJS)\monolib_vlbox.obj & - $(OBJS)\monolib_vscroll.obj + $(OBJS)\monolib_vscroll.obj & + $(OBJS)\monolib_xmlreshandler.obj !endif !endif !ifeq USE_GUI 1 @@ -1387,7 +1392,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_region.obj & $(OBJS)\monolib_renderer.obj & $(OBJS)\monolib_settings.obj & - $(OBJS)\monolib_textmeasure.obj & + $(OBJS)\monolib_textmeasure.obj & $(OBJS)\monolib_tooltip.obj & $(OBJS)\monolib_toplevel.obj & $(OBJS)\monolib_uiaction.obj & @@ -1567,7 +1572,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_tbarbase.obj & $(OBJS)\monolib_textcmn.obj & $(OBJS)\monolib_textentrycmn.obj & - $(OBJS)\monolib_textmeasurecmn.obj & + $(OBJS)\monolib_textmeasurecmn.obj & $(OBJS)\monolib_toplvcmn.obj & $(OBJS)\monolib_treebase.obj & $(OBJS)\monolib_uiactioncmn.obj & @@ -1612,7 +1617,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_treectlg.obj & $(OBJS)\monolib_treebkg.obj & $(OBJS)\monolib_vlbox.obj & - $(OBJS)\monolib_vscroll.obj + $(OBJS)\monolib_vscroll.obj & + $(OBJS)\monolib_xmlreshandler.obj !endif !endif ____ADVANCED_SRC_FILENAMES_1_OBJECTS = @@ -1811,7 +1817,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_region.obj & $(OBJS)\coredll_renderer.obj & $(OBJS)\coredll_settings.obj & - $(OBJS)\coredll_textmeasure.obj & + $(OBJS)\coredll_textmeasure.obj & $(OBJS)\coredll_tooltip.obj & $(OBJS)\coredll_toplevel.obj & $(OBJS)\coredll_uiaction.obj & @@ -1997,7 +2003,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_tbarbase.obj & $(OBJS)\coredll_textcmn.obj & $(OBJS)\coredll_textentrycmn.obj & - $(OBJS)\coredll_textmeasurecmn.obj & + $(OBJS)\coredll_textmeasurecmn.obj & $(OBJS)\coredll_toplvcmn.obj & $(OBJS)\coredll_treebase.obj & $(OBJS)\coredll_uiactioncmn.obj & @@ -2042,7 +2048,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_treectlg.obj & $(OBJS)\coredll_treebkg.obj & $(OBJS)\coredll_vlbox.obj & - $(OBJS)\coredll_vscroll.obj + $(OBJS)\coredll_vscroll.obj & + $(OBJS)\coredll_xmlreshandler.obj !endif !endif !ifeq USE_GUI 1 @@ -2090,7 +2097,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_region.obj & $(OBJS)\coredll_renderer.obj & $(OBJS)\coredll_settings.obj & - $(OBJS)\coredll_textmeasure.obj & + $(OBJS)\coredll_textmeasure.obj & $(OBJS)\coredll_tooltip.obj & $(OBJS)\coredll_toplevel.obj & $(OBJS)\coredll_uiaction.obj & @@ -2270,7 +2277,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_tbarbase.obj & $(OBJS)\coredll_textcmn.obj & $(OBJS)\coredll_textentrycmn.obj & - $(OBJS)\coredll_textmeasurecmn.obj & + $(OBJS)\coredll_textmeasurecmn.obj & $(OBJS)\coredll_toplvcmn.obj & $(OBJS)\coredll_treebase.obj & $(OBJS)\coredll_uiactioncmn.obj & @@ -2315,7 +2322,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_treectlg.obj & $(OBJS)\coredll_treebkg.obj & $(OBJS)\coredll_vlbox.obj & - $(OBJS)\coredll_vscroll.obj + $(OBJS)\coredll_vscroll.obj & + $(OBJS)\coredll_xmlreshandler.obj !endif !endif __corelib___depname = @@ -2373,7 +2381,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_region.obj & $(OBJS)\corelib_renderer.obj & $(OBJS)\corelib_settings.obj & - $(OBJS)\corelib_textmeasure.obj & + $(OBJS)\corelib_textmeasure.obj & $(OBJS)\corelib_tooltip.obj & $(OBJS)\corelib_toplevel.obj & $(OBJS)\corelib_uiaction.obj & @@ -2559,7 +2567,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_tbarbase.obj & $(OBJS)\corelib_textcmn.obj & $(OBJS)\corelib_textentrycmn.obj & - $(OBJS)\corelib_textmeasurecmn.obj & + $(OBJS)\corelib_textmeasurecmn.obj & $(OBJS)\corelib_toplvcmn.obj & $(OBJS)\corelib_treebase.obj & $(OBJS)\corelib_uiactioncmn.obj & @@ -2604,7 +2612,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_treectlg.obj & $(OBJS)\corelib_treebkg.obj & $(OBJS)\corelib_vlbox.obj & - $(OBJS)\corelib_vscroll.obj + $(OBJS)\corelib_vscroll.obj & + $(OBJS)\corelib_xmlreshandler.obj !endif !endif !ifeq USE_GUI 1 @@ -2652,7 +2661,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_region.obj & $(OBJS)\corelib_renderer.obj & $(OBJS)\corelib_settings.obj & - $(OBJS)\corelib_textmeasure.obj & + $(OBJS)\corelib_textmeasure.obj & $(OBJS)\corelib_tooltip.obj & $(OBJS)\corelib_toplevel.obj & $(OBJS)\corelib_uiaction.obj & @@ -2832,7 +2841,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_tbarbase.obj & $(OBJS)\corelib_textcmn.obj & $(OBJS)\corelib_textentrycmn.obj & - $(OBJS)\corelib_textmeasurecmn.obj & + $(OBJS)\corelib_textmeasurecmn.obj & $(OBJS)\corelib_toplvcmn.obj & $(OBJS)\corelib_treebase.obj & $(OBJS)\corelib_uiactioncmn.obj & @@ -2877,7 +2886,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_treectlg.obj & $(OBJS)\corelib_treebkg.obj & $(OBJS)\corelib_vlbox.obj & - $(OBJS)\corelib_vscroll.obj + $(OBJS)\corelib_vscroll.obj & + $(OBJS)\corelib_xmlreshandler.obj !endif !endif ____wxcore_namedll_DEP = @@ -5038,7 +5048,8 @@ RICHTEXTDLL_OBJECTS = & $(OBJS)\richtextdll_richtextstyledlg.obj & $(OBJS)\richtextdll_richtextstyles.obj & $(OBJS)\richtextdll_richtextsymboldlg.obj & - $(OBJS)\richtextdll_richtextxml.obj + $(OBJS)\richtextdll_richtextxml.obj & + $(OBJS)\richtextdll_xh_richtext.obj RICHTEXTLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & @@ -5059,7 +5070,8 @@ RICHTEXTLIB_OBJECTS = & $(OBJS)\richtextlib_richtextstyledlg.obj & $(OBJS)\richtextlib_richtextstyles.obj & $(OBJS)\richtextlib_richtextsymboldlg.obj & - $(OBJS)\richtextlib_richtextxml.obj + $(OBJS)\richtextlib_richtextxml.obj & + $(OBJS)\richtextlib_xh_richtext.obj STCDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & @@ -7728,6 +7740,9 @@ $(OBJS)\monodll_richtextsymboldlg.obj : .AUTODEPEND ..\..\src\richtext\richtext $(OBJS)\monodll_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_xh_richtext.obj : .AUTODEPEND ..\..\src\xrc\xh_richtext.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_stc.obj : .AUTODEPEND ..\..\src\stc\stc.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -7954,11 +7969,11 @@ $(OBJS)\monodll_settings.obj : .AUTODEPEND ..\..\src\msw\settings.cpp !endif !ifeq USE_GUI 1 -$(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 + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 $(OBJS)\monodll_tooltip.obj : .AUTODEPEND ..\..\src\msw\tooltip.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif @@ -8614,11 +8629,11 @@ $(OBJS)\monodll_textentrycmn.obj : .AUTODEPEND ..\..\src\common\textentrycmn.cp !endif !ifeq USE_GUI 1 -$(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 + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 $(OBJS)\monodll_toplvcmn.obj : .AUTODEPEND ..\..\src\common\toplvcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif @@ -8843,6 +8858,11 @@ $(OBJS)\monodll_vscroll.obj : .AUTODEPEND ..\..\src\generic\vscroll.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_xmlreshandler.obj : .AUTODEPEND ..\..\src\xrc\xmlreshandler.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_animatecmn.obj : .AUTODEPEND ..\..\src\common\animatecmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -10164,6 +10184,9 @@ $(OBJS)\monolib_richtextsymboldlg.obj : .AUTODEPEND ..\..\src\richtext\richtext $(OBJS)\monolib_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_xh_richtext.obj : .AUTODEPEND ..\..\src\xrc\xh_richtext.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_stc.obj : .AUTODEPEND ..\..\src\stc\stc.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -10390,11 +10413,11 @@ $(OBJS)\monolib_settings.obj : .AUTODEPEND ..\..\src\msw\settings.cpp !endif !ifeq USE_GUI 1 -$(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 + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 $(OBJS)\monolib_tooltip.obj : .AUTODEPEND ..\..\src\msw\tooltip.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif @@ -11050,11 +11073,11 @@ $(OBJS)\monolib_textentrycmn.obj : .AUTODEPEND ..\..\src\common\textentrycmn.cp !endif !ifeq USE_GUI 1 -$(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 + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 $(OBJS)\monolib_toplvcmn.obj : .AUTODEPEND ..\..\src\common\toplvcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif @@ -11279,6 +11302,11 @@ $(OBJS)\monolib_vscroll.obj : .AUTODEPEND ..\..\src\generic\vscroll.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_xmlreshandler.obj : .AUTODEPEND ..\..\src\xrc\xmlreshandler.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_animatecmn.obj : .AUTODEPEND ..\..\src\common\animatecmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -12790,11 +12818,11 @@ $(OBJS)\coredll_settings.obj : .AUTODEPEND ..\..\src\msw\settings.cpp !endif !ifeq USE_GUI 1 -$(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 + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 $(OBJS)\coredll_tooltip.obj : .AUTODEPEND ..\..\src\msw\tooltip.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif @@ -13450,11 +13478,11 @@ $(OBJS)\coredll_textentrycmn.obj : .AUTODEPEND ..\..\src\common\textentrycmn.cp !endif !ifeq USE_GUI 1 -$(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 + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 $(OBJS)\coredll_toplvcmn.obj : .AUTODEPEND ..\..\src\common\toplvcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif @@ -13679,6 +13707,11 @@ $(OBJS)\coredll_vscroll.obj : .AUTODEPEND ..\..\src\generic\vscroll.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\coredll_xmlreshandler.obj : .AUTODEPEND ..\..\src\xrc\xmlreshandler.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + $(OBJS)\corelib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -14220,11 +14253,11 @@ $(OBJS)\corelib_settings.obj : .AUTODEPEND ..\..\src\msw\settings.cpp !endif !ifeq USE_GUI 1 -$(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 + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 $(OBJS)\corelib_tooltip.obj : .AUTODEPEND ..\..\src\msw\tooltip.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif @@ -14880,11 +14913,11 @@ $(OBJS)\corelib_textentrycmn.obj : .AUTODEPEND ..\..\src\common\textentrycmn.cp !endif !ifeq USE_GUI 1 -$(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 + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 $(OBJS)\corelib_toplvcmn.obj : .AUTODEPEND ..\..\src\common\toplvcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif @@ -15109,6 +15142,11 @@ $(OBJS)\corelib_vscroll.obj : .AUTODEPEND ..\..\src\generic\vscroll.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\corelib_xmlreshandler.obj : .AUTODEPEND ..\..\src\xrc\xmlreshandler.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + $(OBJS)\advdll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< @@ -16297,6 +16335,9 @@ $(OBJS)\richtextdll_richtextsymboldlg.obj : .AUTODEPEND ..\..\src\richtext\rich $(OBJS)\richtextdll_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< +$(OBJS)\richtextdll_xh_richtext.obj : .AUTODEPEND ..\..\src\xrc\xh_richtext.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< + $(OBJS)\richtextlib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< @@ -16330,6 +16371,9 @@ $(OBJS)\richtextlib_richtextsymboldlg.obj : .AUTODEPEND ..\..\src\richtext\rich $(OBJS)\richtextlib_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< +$(OBJS)\richtextlib_xh_richtext.obj : .AUTODEPEND ..\..\src\xrc\xh_richtext.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< + $(OBJS)\stcdll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index 8de65235b6..6735899bed 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -714,10 +714,10 @@ SOURCE=..\..\src\common\textentrycmn.cpp # End Source File # Begin Source File -SOURCE=..\..\src\common\textmeasurecmn.cpp -# End Source File -# Begin Source File - +SOURCE=..\..\src\common\textmeasurecmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\toplvcmn.cpp # End Source File # Begin Source File @@ -2712,10 +2712,10 @@ SOURCE=..\..\src\msw\textentry.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\textmeasure.cpp -# End Source File -# Begin Source File - +SOURCE=..\..\src\msw\textmeasure.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\msw\tglbtn.cpp !IF "$(CFG)" == "core - Win32 DLL Universal Release" @@ -7268,6 +7268,10 @@ SOURCE=..\..\include\wx\xrc\xh_radbx.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\xrc\xh_richtext.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\xrc\xh_scrol.h # End Source File # Begin Source File @@ -7356,6 +7360,10 @@ SOURCE=..\..\include\wx\xrc\xmlres.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\xrc\xmlreshandler.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\xpmdecod.h # End Source File # Begin Source File @@ -7363,6 +7371,14 @@ SOURCE=..\..\include\wx\xpmdecod.h SOURCE=..\..\include\wx\xpmhand.h # End Source File # End Group +# Begin Group "Source Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\src\xrc\xmlreshandler.cpp +# End Source File +# End Group # End Target # End Project diff --git a/build/msw/wx_richtext.dsp b/build/msw/wx_richtext.dsp index 855e4db785..7235ef5ea8 100644 --- a/build/msw/wx_richtext.dsp +++ b/build/msw/wx_richtext.dsp @@ -616,6 +616,10 @@ SOURCE=..\..\include\wx\richtext\richtextuicustomization.h SOURCE=..\..\include\wx\richtext\richtextxml.h # End Source File +# Begin Source File + +SOURCE=..\..\include\wx\xrc\xh_richtext.h +# End Source File # End Group # Begin Group "Source Files" @@ -660,6 +664,10 @@ SOURCE=..\..\src\richtext\richtextsymboldlg.cpp SOURCE=..\..\src\richtext\richtextxml.cpp # End Source File +# Begin Source File + +SOURCE=..\..\src\xrc\xh_richtext.cpp +# End Source File # End Group # End Target # End Project diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj index 9766ef2d03..faa0dfc452 100644 --- a/build/msw/wx_vc7_core.vcproj +++ b/build/msw/wx_vc7_core.vcproj @@ -6026,6 +6026,9 @@ + + @@ -6092,6 +6095,9 @@ + + @@ -6099,6 +6105,14 @@ RelativePath="..\..\include\wx\xpmhand.h"> + + + + diff --git a/build/msw/wx_vc7_richtext.vcproj b/build/msw/wx_vc7_richtext.vcproj index d87d75716a..48dfabbf46 100644 --- a/build/msw/wx_vc7_richtext.vcproj +++ b/build/msw/wx_vc7_richtext.vcproj @@ -837,6 +837,9 @@ + + + + diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj index 2cf20954ae..d1d4fe703c 100644 --- a/build/msw/wx_vc8_core.vcproj +++ b/build/msw/wx_vc8_core.vcproj @@ -8055,6 +8055,10 @@ RelativePath="..\..\include\wx\xrc\xh_radbx.h" > + + @@ -8143,6 +8147,10 @@ RelativePath="..\..\include\wx\xrc\xmlres.h" > + + @@ -8152,6 +8160,16 @@ > + + + + diff --git a/build/msw/wx_vc8_richtext.vcproj b/build/msw/wx_vc8_richtext.vcproj index 208aa70ae9..a9e89948cc 100644 --- a/build/msw/wx_vc8_richtext.vcproj +++ b/build/msw/wx_vc8_richtext.vcproj @@ -1138,6 +1138,10 @@ RelativePath="..\..\include\wx\richtext\richtextxml.h" > + + + + diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj index 5f25778823..3fcdf1b17a 100644 --- a/build/msw/wx_vc9_core.vcproj +++ b/build/msw/wx_vc9_core.vcproj @@ -8051,6 +8051,10 @@ RelativePath="..\..\include\wx\xrc\xh_radbx.h" > + + @@ -8139,6 +8143,10 @@ RelativePath="..\..\include\wx\xrc\xmlres.h" > + + @@ -8148,6 +8156,16 @@ > + + + + diff --git a/build/msw/wx_vc9_richtext.vcproj b/build/msw/wx_vc9_richtext.vcproj index 101de1b653..80178e5ce5 100644 --- a/build/msw/wx_vc9_richtext.vcproj +++ b/build/msw/wx_vc9_richtext.vcproj @@ -1134,6 +1134,10 @@ RelativePath="..\..\include\wx\richtext\richtextxml.h" > + + + + diff --git a/docs/doxygen/overviews/xrc_format.h b/docs/doxygen/overviews/xrc_format.h index 3f46e151f3..be5cfce215 100644 --- a/docs/doxygen/overviews/xrc_format.h +++ b/docs/doxygen/overviews/xrc_format.h @@ -1402,6 +1402,15 @@ Example: 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 + + AddHandler(new wxRichTextCtrl); +@endcode +to use it. + @subsubsection xrc_wxscrollbar wxScrollBar diff --git a/include/wx/xrc/xh_richtext.h b/include/wx/xrc/xh_richtext.h index 910d0fe0a5..08007bde66 100644 --- a/include/wx/xrc/xh_richtext.h +++ b/include/wx/xrc/xh_richtext.h @@ -15,7 +15,7 @@ #if wxUSE_XRC && wxUSE_RICHTEXT -class WXDLLIMPEXP_XRC wxRichTextCtrlXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_RICHTEXT wxRichTextCtrlXmlHandler : public wxXmlResourceHandler { DECLARE_DYNAMIC_CLASS(wxRichTextCtrlXmlHandler) diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h index 97bd03daa7..85b8a87722 100644 --- a/include/wx/xrc/xmlres.h +++ b/include/wx/xrc/xmlres.h @@ -31,6 +31,8 @@ #include "wx/xml/xml.h" +#include "wx/xrc/xmlreshandler.h" + class WXDLLIMPEXP_FWD_BASE wxFileName; class WXDLLIMPEXP_FWD_CORE wxIconBundle; @@ -43,7 +45,6 @@ class WXDLLIMPEXP_FWD_CORE wxWindow; class WXDLLIMPEXP_FWD_CORE wxFrame; class WXDLLIMPEXP_FWD_CORE wxToolBar; -class WXDLLIMPEXP_FWD_XRC wxXmlResourceHandler; class WXDLLIMPEXP_FWD_XRC wxXmlSubclassFactory; class wxXmlSubclassFactories; class wxXmlResourceModule; @@ -393,7 +394,7 @@ private: // 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; @@ -443,18 +444,20 @@ private: #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. @@ -465,33 +468,12 @@ public: 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. . - 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, content is represented as @@ -512,13 +494,6 @@ protected: // 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); @@ -611,12 +586,11 @@ protected: // 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' @@ -630,8 +604,6 @@ protected: // 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) \ diff --git a/include/wx/xrc/xmlreshandler.h b/include/wx/xrc/xmlreshandler.h new file mode 100644 index 0000000000..46eb374c18 --- /dev/null +++ b/include/wx/xrc/xmlreshandler.h @@ -0,0 +1,372 @@ +///////////////////////////////////////////////////////////////////////////// +// 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_ diff --git a/src/xrc/xh_richtext.cpp b/src/xrc/xh_richtext.cpp index 0d8146785f..d9ec0f10b9 100644 --- a/src/xrc/xh_richtext.cpp +++ b/src/xrc/xh_richtext.cpp @@ -15,10 +15,9 @@ #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) diff --git a/src/xrc/xmladv.cpp b/src/xrc/xmladv.cpp index 5087147e2f..6f6f36067a 100644 --- a/src/xrc/xmladv.cpp +++ b/src/xrc/xmladv.cpp @@ -38,7 +38,7 @@ // ============================================================================ #if wxUSE_ANIMATIONCTRL -wxAnimation wxXmlResourceHandler::GetAnimation(const wxString& param) +wxAnimation wxXmlResourceHandlerImpl::GetAnimation(const wxString& param) { const wxString name = GetParamValue(param); if ( name.empty() ) diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp index 06edee5ffc..a600a58db3 100644 --- a/src/xrc/xmlres.cpp +++ b/src/xrc/xmlres.cpp @@ -431,16 +431,18 @@ bool wxXmlResource::Unload(const wxString& filename) } -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); } @@ -1401,23 +1403,35 @@ public: -wxXmlResourceHandler::wxXmlResourceHandler() - : m_node(NULL), m_parent(NULL), m_instance(NULL), - m_parentAsWindow(NULL) -{} - - - -wxObject *wxXmlResourceHandler::CreateResource(wxXmlNode *node, wxObject *parent, wxObject *instance) +wxXmlResourceHandlerImpl::wxXmlResourceHandlerImpl(wxXmlResourceHandler *handler) + :wxXmlResourceHandlerImplBase(handler) { - wxXmlNode *myNode = m_node; - wxString myClass = m_class; - wxObject *myParent = m_parent, *myInstance = m_instance; - wxWindow *myParentAW = m_parentAsWindow; +} - m_instance = instance; - if (!m_instance && node->HasAttribute(wxT("subclass")) && - !(m_resource->GetFlags() & wxXRC_NO_SUBCLASSING)) +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 *wxXmlResourceHandlerImpl::CreateResource(wxXmlNode *node, wxObject *parent, wxObject *instance) +{ + 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_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()) @@ -1425,12 +1439,12 @@ wxObject *wxXmlResourceHandler::CreateResource(wxXmlNode *node, wxObject *parent 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 @@ -1446,70 +1460,28 @@ wxObject *wxXmlResourceHandler::CreateResource(wxXmlNode *node, wxObject *parent } } - 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); @@ -1522,10 +1494,10 @@ int wxXmlResourceHandler::GetStyle(const wxString& param, int defaults) 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 { @@ -1541,19 +1513,19 @@ int wxXmlResourceHandler::GetStyle(const wxString& param, int defaults) -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 ) @@ -1604,12 +1576,12 @@ wxString wxXmlResourceHandler::GetText(const wxString& param, bool translate) } } - 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 { @@ -1631,7 +1603,7 @@ wxString wxXmlResourceHandler::GetText(const wxString& param, bool translate) -long wxXmlResourceHandler::GetLong(const wxString& param, long defaultv) +long wxXmlResourceHandlerImpl::GetLong(const wxString& param, long defaultv) { long value = defaultv; wxString str1 = GetParamValue(param); @@ -1651,7 +1623,7 @@ long wxXmlResourceHandler::GetLong(const wxString& param, long defaultv) return value; } -float wxXmlResourceHandler::GetFloat(const wxString& param, float defaultv) +float wxXmlResourceHandlerImpl::GetFloat(const wxString& param, float defaultv) { wxString str = GetParamValue(param); @@ -1675,27 +1647,27 @@ float wxXmlResourceHandler::GetFloat(const wxString& param, float defaultv) } -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); @@ -1752,7 +1724,7 @@ static wxColour GetSystemColour(const wxString& name) return wxNullColour; } -wxColour wxXmlResourceHandler::GetColour(const wxString& param, const wxColour& defaultv) +wxColour wxXmlResourceHandlerImpl::GetColour(const wxString& param, const wxColour& defaultv) { wxString v = GetParamValue(param); @@ -1812,7 +1784,7 @@ bool GetStockArtAttrs(const wxXmlNode *paramNode, } // anonymous namespace -wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param, +wxBitmap wxXmlResourceHandlerImpl::GetBitmap(const wxString& param, const wxArtClient& defaultArtClient, wxSize size) { @@ -1833,7 +1805,7 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param, return GetBitmap(node, defaultArtClient, size); } -wxBitmap wxXmlResourceHandler::GetBitmap(const wxXmlNode* node, +wxBitmap wxXmlResourceHandlerImpl::GetBitmap(const wxXmlNode* node, const wxArtClient& defaultArtClient, wxSize size) { @@ -1883,7 +1855,7 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxXmlNode* node, } -wxIcon wxXmlResourceHandler::GetIcon(const wxString& param, +wxIcon wxXmlResourceHandlerImpl::GetIcon(const wxString& param, const wxArtClient& defaultArtClient, wxSize size) { @@ -1901,7 +1873,7 @@ wxIcon wxXmlResourceHandler::GetIcon(const wxString& param, return GetIcon(node, defaultArtClient, size); } -wxIcon wxXmlResourceHandler::GetIcon(const wxXmlNode* node, +wxIcon wxXmlResourceHandlerImpl::GetIcon(const wxXmlNode* node, const wxArtClient& defaultArtClient, wxSize size) { @@ -1911,7 +1883,7 @@ wxIcon wxXmlResourceHandler::GetIcon(const wxXmlNode* node, } -wxIconBundle wxXmlResourceHandler::GetIconBundle(const wxString& param, +wxIconBundle wxXmlResourceHandlerImpl::GetIconBundle(const wxString& param, const wxArtClient& defaultArtClient) { wxString art_id, art_client; @@ -1959,14 +1931,14 @@ wxIconBundle wxXmlResourceHandler::GetIconBundle(const wxString& param, } -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. @@ -1978,7 +1950,7 @@ wxImageList *wxXmlResourceHandler::GetImageList(const wxString& param) 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) @@ -2003,15 +1975,15 @@ wxImageList *wxXmlResourceHandler::GetImageList(const wxString& param) } } - 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) { @@ -2030,15 +2002,14 @@ wxXmlNode *wxXmlResourceHandler::GetParamNode(const wxString& param) 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; @@ -2056,21 +2027,21 @@ wxString wxXmlResourceHandler::GetNodeContent(const wxXmlNode *node) -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); @@ -2098,9 +2069,9 @@ wxSize wxXmlResourceHandler::GetSize(const wxString& 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 { @@ -2118,7 +2089,7 @@ wxSize wxXmlResourceHandler::GetSize(const wxString& param, -wxPoint wxXmlResourceHandler::GetPosition(const wxString& param) +wxPoint wxXmlResourceHandlerImpl::GetPosition(const wxString& param) { wxSize sz = GetSize(param); return wxPoint(sz.x, sz.y); @@ -2126,7 +2097,7 @@ wxPoint wxXmlResourceHandler::GetPosition(const wxString& param) -wxCoord wxXmlResourceHandler::GetDimension(const wxString& param, +wxCoord wxXmlResourceHandlerImpl::GetDimension(const wxString& param, wxCoord defaultv, wxWindow *windowToUse) { @@ -2154,9 +2125,9 @@ wxCoord wxXmlResourceHandler::GetDimension(const wxString& param, { 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 { @@ -2173,7 +2144,7 @@ wxCoord wxXmlResourceHandler::GetDimension(const wxString& param, } wxDirection -wxXmlResourceHandler::GetDirection(const wxString& param, wxDirection dirDefault) +wxXmlResourceHandlerImpl::GetDirection(const wxString& param, wxDirection dirDefault) { wxDirection dir; @@ -2227,7 +2198,7 @@ static wxFont GetSystemFont(const wxString& name) 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) @@ -2237,8 +2208,8 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param, wxWindow* parent) return wxNullFont; } - wxXmlNode *oldnode = m_node; - m_node = font_node; + wxXmlNode *oldnode = m_handler->m_node; + m_handler->m_node = font_node; // font attributes: @@ -2422,12 +2393,12 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param, wxWindow* parent) 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 @@ -2463,28 +2434,28 @@ void wxXmlResourceHandler::SetupWindow(wxWindow *wnd) } -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); } @@ -2497,21 +2468,21 @@ void wxXmlResourceHandler::CreateChildrenPrivately(wxObject *parent, wxXmlNode * // 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) diff --git a/src/xrc/xmlreshandler.cpp b/src/xrc/xmlreshandler.cpp new file mode 100644 index 0000000000..cb7351d1f1 --- /dev/null +++ b/src/xrc/xmlreshandler.cpp @@ -0,0 +1,69 @@ +///////////////////////////////////////////////////////////////////////////// +// 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 diff --git a/src/xrc/xmlrsall.cpp b/src/xrc/xmlrsall.cpp index e823ea9e00..1a9dbe2bb6 100644 --- a/src/xrc/xmlrsall.cpp +++ b/src/xrc/xmlrsall.cpp @@ -146,9 +146,6 @@ void wxXmlResource::InitAllHandlers() #if wxUSE_RADIOBTN AddHandler(new wxRadioButtonXmlHandler); #endif -#if 0 && wxUSE_RICHTEXT - AddHandler(new wxRichTextCtrlXmlHandler); -#endif #if wxUSE_SCROLLBAR AddHandler(new wxScrollBarXmlHandler); #endif