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

rebaked after addition of XRC handler for richtext control

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-11-08 16:57:52 +00:00
parent 4abf84fb01
commit fd2ce1d1c1
8 changed files with 101 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
build/msw/makefile.bcc
View File

@@ -974,6 +974,7 @@ 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 \
@@ -1039,6 +1040,7 @@ 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 \
@@ -1278,6 +1280,7 @@ ____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 \
@@ -1890,6 +1893,7 @@ ____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 \
@@ -5161,6 +5165,9 @@ $(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) $**
@@ -7148,6 +7155,9 @@ $(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) $**
@@ -12178,6 +12188,9 @@ $(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) $**
@@ -12346,6 +12359,9 @@ $(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) $**

16
build/msw/makefile.gcc
View File

@@ -973,6 +973,7 @@ 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 \
@@ -1038,6 +1039,7 @@ 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 \
@@ -1287,6 +1289,7 @@ ____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 \
@@ -1905,6 +1908,7 @@ ____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 \
@@ -5278,6 +5282,9 @@ $(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) $<
@@ -7365,6 +7372,9 @@ $(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) $<
@@ -12695,6 +12705,9 @@ $(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) $<
@@ -12863,6 +12876,9 @@ $(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) $<

16
build/msw/makefile.vc
View File

@@ -1054,6 +1054,7 @@ 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 \
@@ -1121,6 +1122,7 @@ 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 \
@@ -1445,6 +1447,7 @@ ____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 \
@@ -2063,6 +2066,7 @@ ____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 \
@@ -5494,6 +5498,9 @@ $(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) $**
@@ -7481,6 +7488,9 @@ $(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) $**
@@ -12511,6 +12521,9 @@ $(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) $**
@@ -12679,6 +12692,9 @@ $(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) $**

16
build/msw/makefile.wat
View File

@@ -168,6 +168,7 @@ ____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 &
@@ -790,6 +791,7 @@ ____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 &
@@ -3703,6 +3705,7 @@ 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 &
@@ -3768,6 +3771,7 @@ 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 &
@@ -5506,6 +5510,9 @@ $(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) $<
@@ -7593,6 +7600,9 @@ $(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) $<
@@ -12923,6 +12933,9 @@ $(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) $<
@@ -13091,6 +13104,9 @@ $(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) $<

4
build/msw/wx_core.dsp
View File

@@ -9545,6 +9545,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

8
build/msw/wx_xrc.dsp
View File

@@ -1102,6 +1102,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
@@ -1322,6 +1326,10 @@ 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