From: Vadim Zeitlin Date: Thu, 9 Nov 2006 00:34:56 +0000 (+0000) Subject: temporarily disable XRC richtext handler to avoid breaking the build X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/87c2432d225b16202e60e8385b9172c7c270ef03 temporarily disable XRC richtext handler to avoid breaking the build git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/Makefile.in b/Makefile.in index e30e0a9a21..4f650c7605 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1341,7 +1341,6 @@ XRCDLL_OBJECTS = \ xrcdll_xh_panel.o \ xrcdll_xh_radbt.o \ xrcdll_xh_radbx.o \ - xrcdll_xh_richtext.o \ xrcdll_xh_scrol.o \ xrcdll_xh_scwin.o \ xrcdll_xh_htmllbox.o \ @@ -1403,7 +1402,6 @@ XRCLIB_OBJECTS = \ xrclib_xh_panel.o \ xrclib_xh_radbt.o \ xrclib_xh_radbx.o \ - xrclib_xh_richtext.o \ xrclib_xh_scrol.o \ xrclib_xh_scwin.o \ xrclib_xh_htmllbox.o \ @@ -3068,7 +3066,6 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/xrc/xh_panel.h \ wx/xrc/xh_radbt.h \ wx/xrc/xh_radbx.h \ - wx/xrc/xh_richtext.h \ wx/xrc/xh_scrol.h \ wx/xrc/xh_scwin.h \ wx/xrc/xh_htmllbox.h \ @@ -3382,7 +3379,6 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \ monodll_xh_panel.o \ monodll_xh_radbt.o \ monodll_xh_radbx.o \ - monodll_xh_richtext.o \ monodll_xh_scrol.o \ monodll_xh_scwin.o \ monodll_xh_htmllbox.o \ @@ -5147,7 +5143,6 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \ monolib_xh_panel.o \ monolib_xh_radbt.o \ monolib_xh_radbx.o \ - monolib_xh_richtext.o \ monolib_xh_scrol.o \ monolib_xh_scwin.o \ monolib_xh_htmllbox.o \ @@ -13100,9 +13095,6 @@ monodll_xh_radbt.o: $(srcdir)/src/xrc/xh_radbt.cpp $(MONODLL_ODEP) monodll_xh_radbx.o: $(srcdir)/src/xrc/xh_radbx.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_radbx.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_xh_scrol.o: $(srcdir)/src/xrc/xh_scrol.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_scrol.cpp @@ -17183,9 +17175,6 @@ monolib_xh_radbt.o: $(srcdir)/src/xrc/xh_radbt.cpp $(MONOLIB_ODEP) monolib_xh_radbx.o: $(srcdir)/src/xrc/xh_radbx.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_radbx.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_xh_scrol.o: $(srcdir)/src/xrc/xh_scrol.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_scrol.cpp @@ -28523,9 +28512,6 @@ xrcdll_xh_radbt.o: $(srcdir)/src/xrc/xh_radbt.cpp $(XRCDLL_ODEP) xrcdll_xh_radbx.o: $(srcdir)/src/xrc/xh_radbx.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_radbx.cpp -xrcdll_xh_richtext.o: $(srcdir)/src/xrc/xh_richtext.cpp $(XRCDLL_ODEP) - $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_richtext.cpp - xrcdll_xh_scrol.o: $(srcdir)/src/xrc/xh_scrol.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_scrol.cpp @@ -28691,9 +28677,6 @@ xrclib_xh_radbt.o: $(srcdir)/src/xrc/xh_radbt.cpp $(XRCLIB_ODEP) xrclib_xh_radbx.o: $(srcdir)/src/xrc/xh_radbx.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_radbx.cpp -xrclib_xh_richtext.o: $(srcdir)/src/xrc/xh_richtext.cpp $(XRCLIB_ODEP) - $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_richtext.cpp - xrclib_xh_scrol.o: $(srcdir)/src/xrc/xh_scrol.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_scrol.cpp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 640f876585..0b9e07dc82 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -2955,7 +2955,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/xrc/xh_panel.cpp src/xrc/xh_radbt.cpp src/xrc/xh_radbx.cpp - src/xrc/xh_richtext.cpp + + src/xrc/xh_scrol.cpp src/xrc/xh_scwin.cpp src/xrc/xh_htmllbox.cpp @@ -3014,7 +3015,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/xrc/xh_panel.h wx/xrc/xh_radbt.h wx/xrc/xh_radbx.h - wx/xrc/xh_richtext.h + wx/xrc/xh_scrol.h wx/xrc/xh_scwin.h wx/xrc/xh_htmllbox.h diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 1e46730163..433825e7b7 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -974,7 +974,6 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_xh_panel.obj \ $(OBJS)\xrcdll_xh_radbt.obj \ $(OBJS)\xrcdll_xh_radbx.obj \ - $(OBJS)\xrcdll_xh_richtext.obj \ $(OBJS)\xrcdll_xh_scrol.obj \ $(OBJS)\xrcdll_xh_scwin.obj \ $(OBJS)\xrcdll_xh_htmllbox.obj \ @@ -1040,7 +1039,6 @@ XRCLIB_OBJECTS = \ $(OBJS)\xrclib_xh_panel.obj \ $(OBJS)\xrclib_xh_radbt.obj \ $(OBJS)\xrclib_xh_radbx.obj \ - $(OBJS)\xrclib_xh_richtext.obj \ $(OBJS)\xrclib_xh_scrol.obj \ $(OBJS)\xrclib_xh_scwin.obj \ $(OBJS)\xrclib_xh_htmllbox.obj \ @@ -1280,7 +1278,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_xh_panel.obj \ $(OBJS)\monodll_xh_radbt.obj \ $(OBJS)\monodll_xh_radbx.obj \ - $(OBJS)\monodll_xh_richtext.obj \ $(OBJS)\monodll_xh_scrol.obj \ $(OBJS)\monodll_xh_scwin.obj \ $(OBJS)\monodll_xh_htmllbox.obj \ @@ -1893,7 +1890,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_xh_panel.obj \ $(OBJS)\monolib_xh_radbt.obj \ $(OBJS)\monolib_xh_radbx.obj \ - $(OBJS)\monolib_xh_richtext.obj \ $(OBJS)\monolib_xh_scrol.obj \ $(OBJS)\monolib_xh_scwin.obj \ $(OBJS)\monolib_xh_htmllbox.obj \ @@ -5165,9 +5161,6 @@ $(OBJS)\monodll_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp $(OBJS)\monodll_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** - $(OBJS)\monodll_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -7155,9 +7148,6 @@ $(OBJS)\monolib_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp $(OBJS)\monolib_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** - $(OBJS)\monolib_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -12188,9 +12178,6 @@ $(OBJS)\xrcdll_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp $(OBJS)\xrcdll_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** -$(OBJS)\xrcdll_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** - $(OBJS)\xrcdll_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** @@ -12359,9 +12346,6 @@ $(OBJS)\xrclib_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp $(OBJS)\xrclib_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** -$(OBJS)\xrclib_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** - $(OBJS)\xrclib_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index b0cc08fcbd..f76c70a893 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -973,7 +973,6 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_xh_panel.o \ $(OBJS)\xrcdll_xh_radbt.o \ $(OBJS)\xrcdll_xh_radbx.o \ - $(OBJS)\xrcdll_xh_richtext.o \ $(OBJS)\xrcdll_xh_scrol.o \ $(OBJS)\xrcdll_xh_scwin.o \ $(OBJS)\xrcdll_xh_htmllbox.o \ @@ -1039,7 +1038,6 @@ XRCLIB_OBJECTS = \ $(OBJS)\xrclib_xh_panel.o \ $(OBJS)\xrclib_xh_radbt.o \ $(OBJS)\xrclib_xh_radbx.o \ - $(OBJS)\xrclib_xh_richtext.o \ $(OBJS)\xrclib_xh_scrol.o \ $(OBJS)\xrclib_xh_scwin.o \ $(OBJS)\xrclib_xh_htmllbox.o \ @@ -1289,7 +1287,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_xh_panel.o \ $(OBJS)\monodll_xh_radbt.o \ $(OBJS)\monodll_xh_radbx.o \ - $(OBJS)\monodll_xh_richtext.o \ $(OBJS)\monodll_xh_scrol.o \ $(OBJS)\monodll_xh_scwin.o \ $(OBJS)\monodll_xh_htmllbox.o \ @@ -1908,7 +1905,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_xh_panel.o \ $(OBJS)\monolib_xh_radbt.o \ $(OBJS)\monolib_xh_radbx.o \ - $(OBJS)\monolib_xh_richtext.o \ $(OBJS)\monolib_xh_scrol.o \ $(OBJS)\monolib_xh_scwin.o \ $(OBJS)\monolib_xh_htmllbox.o \ @@ -5282,9 +5278,6 @@ $(OBJS)\monodll_xh_radbt.o: ../../src/xrc/xh_radbt.cpp $(OBJS)\monodll_xh_radbx.o: ../../src/xrc/xh_radbx.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_xh_scrol.o: ../../src/xrc/xh_scrol.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -7372,9 +7365,6 @@ $(OBJS)\monolib_xh_radbt.o: ../../src/xrc/xh_radbt.cpp $(OBJS)\monolib_xh_radbx.o: ../../src/xrc/xh_radbx.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_xh_scrol.o: ../../src/xrc/xh_scrol.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -12705,9 +12695,6 @@ $(OBJS)\xrcdll_xh_radbt.o: ../../src/xrc/xh_radbt.cpp $(OBJS)\xrcdll_xh_radbx.o: ../../src/xrc/xh_radbx.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\xrcdll_xh_richtext.o: ../../src/xrc/xh_richtext.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\xrcdll_xh_scrol.o: ../../src/xrc/xh_scrol.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< @@ -12876,9 +12863,6 @@ $(OBJS)\xrclib_xh_radbt.o: ../../src/xrc/xh_radbt.cpp $(OBJS)\xrclib_xh_radbx.o: ../../src/xrc/xh_radbx.cpp $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\xrclib_xh_richtext.o: ../../src/xrc/xh_richtext.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\xrclib_xh_scrol.o: ../../src/xrc/xh_scrol.cpp $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index e1a80a8ae8..b3830ed708 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -1054,7 +1054,6 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_xh_panel.obj \ $(OBJS)\xrcdll_xh_radbt.obj \ $(OBJS)\xrcdll_xh_radbx.obj \ - $(OBJS)\xrcdll_xh_richtext.obj \ $(OBJS)\xrcdll_xh_scrol.obj \ $(OBJS)\xrcdll_xh_scwin.obj \ $(OBJS)\xrcdll_xh_htmllbox.obj \ @@ -1122,7 +1121,6 @@ XRCLIB_OBJECTS = \ $(OBJS)\xrclib_xh_panel.obj \ $(OBJS)\xrclib_xh_radbt.obj \ $(OBJS)\xrclib_xh_radbx.obj \ - $(OBJS)\xrclib_xh_richtext.obj \ $(OBJS)\xrclib_xh_scrol.obj \ $(OBJS)\xrclib_xh_scwin.obj \ $(OBJS)\xrclib_xh_htmllbox.obj \ @@ -1447,7 +1445,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_xh_panel.obj \ $(OBJS)\monodll_xh_radbt.obj \ $(OBJS)\monodll_xh_radbx.obj \ - $(OBJS)\monodll_xh_richtext.obj \ $(OBJS)\monodll_xh_scrol.obj \ $(OBJS)\monodll_xh_scwin.obj \ $(OBJS)\monodll_xh_htmllbox.obj \ @@ -2066,7 +2063,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_xh_panel.obj \ $(OBJS)\monolib_xh_radbt.obj \ $(OBJS)\monolib_xh_radbx.obj \ - $(OBJS)\monolib_xh_richtext.obj \ $(OBJS)\monolib_xh_scrol.obj \ $(OBJS)\monolib_xh_scwin.obj \ $(OBJS)\monolib_xh_htmllbox.obj \ @@ -5498,9 +5494,6 @@ $(OBJS)\monodll_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp $(OBJS)\monodll_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** - $(OBJS)\monodll_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -7488,9 +7481,6 @@ $(OBJS)\monolib_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp $(OBJS)\monolib_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** - $(OBJS)\monolib_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -12521,9 +12511,6 @@ $(OBJS)\xrcdll_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp $(OBJS)\xrcdll_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** -$(OBJS)\xrcdll_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** - $(OBJS)\xrcdll_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** @@ -12692,9 +12679,6 @@ $(OBJS)\xrclib_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp $(OBJS)\xrclib_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** -$(OBJS)\xrclib_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** - $(OBJS)\xrclib_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index d779b50fe6..2bc49a470e 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -168,7 +168,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_xh_panel.obj & $(OBJS)\monodll_xh_radbt.obj & $(OBJS)\monodll_xh_radbx.obj & - $(OBJS)\monodll_xh_richtext.obj & $(OBJS)\monodll_xh_scrol.obj & $(OBJS)\monodll_xh_scwin.obj & $(OBJS)\monodll_xh_htmllbox.obj & @@ -791,7 +790,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_xh_panel.obj & $(OBJS)\monolib_xh_radbt.obj & $(OBJS)\monolib_xh_radbx.obj & - $(OBJS)\monolib_xh_richtext.obj & $(OBJS)\monolib_xh_scrol.obj & $(OBJS)\monolib_xh_scwin.obj & $(OBJS)\monolib_xh_htmllbox.obj & @@ -3705,7 +3703,6 @@ XRCDLL_OBJECTS = & $(OBJS)\xrcdll_xh_panel.obj & $(OBJS)\xrcdll_xh_radbt.obj & $(OBJS)\xrcdll_xh_radbx.obj & - $(OBJS)\xrcdll_xh_richtext.obj & $(OBJS)\xrcdll_xh_scrol.obj & $(OBJS)\xrcdll_xh_scwin.obj & $(OBJS)\xrcdll_xh_htmllbox.obj & @@ -3771,7 +3768,6 @@ XRCLIB_OBJECTS = & $(OBJS)\xrclib_xh_panel.obj & $(OBJS)\xrclib_xh_radbt.obj & $(OBJS)\xrclib_xh_radbx.obj & - $(OBJS)\xrclib_xh_richtext.obj & $(OBJS)\xrclib_xh_scrol.obj & $(OBJS)\xrclib_xh_scwin.obj & $(OBJS)\xrclib_xh_htmllbox.obj & @@ -5510,9 +5506,6 @@ $(OBJS)\monodll_xh_radbt.obj : .AUTODEPEND ..\..\src\xrc\xh_radbt.cpp $(OBJS)\monodll_xh_radbx.obj : .AUTODEPEND ..\..\src\xrc\xh_radbx.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_xh_scrol.obj : .AUTODEPEND ..\..\src\xrc\xh_scrol.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -7600,9 +7593,6 @@ $(OBJS)\monolib_xh_radbt.obj : .AUTODEPEND ..\..\src\xrc\xh_radbt.cpp $(OBJS)\monolib_xh_radbx.obj : .AUTODEPEND ..\..\src\xrc\xh_radbx.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_xh_scrol.obj : .AUTODEPEND ..\..\src\xrc\xh_scrol.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -12933,9 +12923,6 @@ $(OBJS)\xrcdll_xh_radbt.obj : .AUTODEPEND ..\..\src\xrc\xh_radbt.cpp $(OBJS)\xrcdll_xh_radbx.obj : .AUTODEPEND ..\..\src\xrc\xh_radbx.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< -$(OBJS)\xrcdll_xh_richtext.obj : .AUTODEPEND ..\..\src\xrc\xh_richtext.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - $(OBJS)\xrcdll_xh_scrol.obj : .AUTODEPEND ..\..\src\xrc\xh_scrol.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< @@ -13104,9 +13091,6 @@ $(OBJS)\xrclib_xh_radbt.obj : .AUTODEPEND ..\..\src\xrc\xh_radbt.cpp $(OBJS)\xrclib_xh_radbx.obj : .AUTODEPEND ..\..\src\xrc\xh_radbx.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< -$(OBJS)\xrclib_xh_richtext.obj : .AUTODEPEND ..\..\src\xrc\xh_richtext.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - $(OBJS)\xrclib_xh_scrol.obj : .AUTODEPEND ..\..\src\xrc\xh_scrol.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index 5a1d35f205..32a6db3f77 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -9545,10 +9545,6 @@ 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 diff --git a/build/msw/wx_xrc.dsp b/build/msw/wx_xrc.dsp index 2688ec4780..863bfe8ee4 100644 --- a/build/msw/wx_xrc.dsp +++ b/build/msw/wx_xrc.dsp @@ -1102,10 +1102,6 @@ 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 @@ -1326,10 +1322,6 @@ SOURCE=..\..\src\xrc\xh_radbx.cpp # End Source File # Begin Source File -SOURCE=..\..\src\xrc\xh_richtext.cpp -# End Source File -# Begin Source File - SOURCE=..\..\src\xrc\xh_scrol.cpp # End Source File # Begin Source File diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp index 8688987607..552985fad1 100644 --- a/src/wxWindows.dsp +++ b/src/wxWindows.dsp @@ -2035,10 +2035,6 @@ SOURCE=.\xrc\xh_radbx.cpp # End Source File # Begin Source File -SOURCE=.\xrc\xh_richtext.cpp -# End Source File -# Begin Source File - SOURCE=.\xrc\xh_scrol.cpp # End Source File # Begin Source File @@ -3659,10 +3655,6 @@ 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 diff --git a/src/xrc/xmlrsall.cpp b/src/xrc/xmlrsall.cpp index 9f422fce6e..b8c129505b 100644 --- a/src/xrc/xmlrsall.cpp +++ b/src/xrc/xmlrsall.cpp @@ -128,7 +128,7 @@ void wxXmlResource::InitAllHandlers() #if wxUSE_RADIOBTN AddHandler(new wxRadioButtonXmlHandler); #endif -#if wxUSE_RICHTEXT +#if 0 && wxUSE_RICHTEXT AddHandler(new wxRichTextCtrlXmlHandler); #endif #if wxUSE_SCROLLBAR