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

Removed duplicate xh_grid.cpp/h and rebaked files

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-11-29 09:03:35 +00:00
parent 3f97aec58a
commit b377eda09d
9 changed files with 1951 additions and 2061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Makefile.in
View File

@@ -1271,7 +1271,6 @@ XRCDLL_OBJECTS = \
xrcdll_xh_treebk.o \
xrcdll_xh_unkwn.o \
xrcdll_xh_wizrd.o \
xrcdll_xh_grid.o \
xrcdll_xmlres.o \
xrcdll_xmlrsall.o
XRCDLL_ODEP = $(___pch_wxprec_xrcdll_wx_wxprec_h_gch___depname)
@@ -1323,7 +1322,6 @@ XRCLIB_OBJECTS = \
xrclib_xh_treebk.o \
xrclib_xh_unkwn.o \
xrclib_xh_wizrd.o \
xrclib_xh_grid.o \
xrclib_xmlres.o \
xrclib_xmlrsall.o
XRCLIB_ODEP = $(___pch_wxprec_xrclib_wx_wxprec_h_gch___depname)
@@ -2749,7 +2747,6 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \
wx/xrc/xh_treebk.h \
wx/xrc/xh_unkwn.h \
wx/xrc/xh_wizrd.h \
wx/xrc/xh_grid.h \
wx/xrc/xmlres.h
@COND_USE_GUI_1@ALL_GUI_HEADERS = $(COND_USE_GUI_1_ALL_GUI_HEADERS)
COND_MONOLITHIC_1_SHARED_1___monodll___depname = \
@@ -3027,7 +3024,6 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \
monodll_xh_treebk.o \
monodll_xh_unkwn.o \
monodll_xh_wizrd.o \
monodll_xh_grid.o \
monodll_xmlres.o \
monodll_xmlrsall.o
@COND_USE_GUI_1@__MONOLIB_GUI_SRC_OBJECTS = $(COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS)
@@ -4507,7 +4503,6 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \
monolib_xh_treebk.o \
monolib_xh_unkwn.o \
monolib_xh_wizrd.o \
monolib_xh_grid.o \
monolib_xmlres.o \
monolib_xmlrsall.o
@COND_USE_GUI_1@__MONOLIB_GUI_SRC_OBJECTS_1 = $(COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1)
@@ -10978,6 +10973,9 @@ monodll_xh_gauge.o: $(srcdir)/src/xrc/xh_gauge.cpp $(MONODLL_ODEP)
monodll_xh_gdctl.o: $(srcdir)/src/xrc/xh_gdctl.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_gdctl.cpp
monodll_xh_grid.o: $(srcdir)/src/xrc/xh_grid.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_grid.cpp
monodll_xh_html.o: $(srcdir)/src/xrc/xh_html.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_html.cpp
@@ -13888,9 +13886,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_USE_GUI_1@monodll_chm.o: $(srcdir)/src/html/chm.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/chm.cpp
@COND_USE_GUI_1@monodll_xh_grid.o: $(srcdir)/src/xrc/xh_grid.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_grid.cpp
monolib_appbase.o: $(srcdir)/src/common/appbase.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/appbase.cpp
@@ -14467,6 +14462,9 @@ monolib_xh_gauge.o: $(srcdir)/src/xrc/xh_gauge.cpp $(MONOLIB_ODEP)
monolib_xh_gdctl.o: $(srcdir)/src/xrc/xh_gdctl.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_gdctl.cpp
monolib_xh_grid.o: $(srcdir)/src/xrc/xh_grid.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_grid.cpp
monolib_xh_html.o: $(srcdir)/src/xrc/xh_html.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_html.cpp
@@ -17377,9 +17375,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_MACOSX_1_USE_GUI_1@monolib_chm.o: $(srcdir)/src/html/chm.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_MACOSX_1_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp
@COND_USE_GUI_1@monolib_xh_grid.o: $(srcdir)/src/xrc/xh_grid.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_grid.cpp
basedll_version_rc.o: $(srcdir)/src/msw/version.rc $(BASEDLL_ODEP)
$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
@@ -24232,6 +24227,9 @@ xrcdll_xh_gauge.o: $(srcdir)/src/xrc/xh_gauge.cpp $(XRCDLL_ODEP)
xrcdll_xh_gdctl.o: $(srcdir)/src/xrc/xh_gdctl.cpp $(XRCDLL_ODEP)
$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_gdctl.cpp
xrcdll_xh_grid.o: $(srcdir)/src/xrc/xh_grid.cpp $(XRCDLL_ODEP)
$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_grid.cpp
xrcdll_xh_html.o: $(srcdir)/src/xrc/xh_html.cpp $(XRCDLL_ODEP)
$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_html.cpp
@@ -24319,12 +24317,6 @@ xrcdll_xmlres.o: $(srcdir)/src/xrc/xmlres.cpp $(XRCDLL_ODEP)
xrcdll_xmlrsall.o: $(srcdir)/src/xrc/xmlrsall.cpp $(XRCDLL_ODEP)
$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xmlrsall.cpp
xrcdll_xh_grid.o: $(srcdir)/src/xrc/xh_grid.cpp $(XRCDLL_ODEP)
$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_grid.cpp
xrcdll_xh_grid.o: $(srcdir)/src/xrc/xh_grid.cpp $(XRCDLL_ODEP)
$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_grid.cpp
xrclib_xh_bmpbt.o: $(srcdir)/src/xrc/xh_bmpbt.cpp $(XRCLIB_ODEP)
$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_bmpbt.cpp
@@ -24370,6 +24362,9 @@ xrclib_xh_gauge.o: $(srcdir)/src/xrc/xh_gauge.cpp $(XRCLIB_ODEP)
xrclib_xh_gdctl.o: $(srcdir)/src/xrc/xh_gdctl.cpp $(XRCLIB_ODEP)
$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_gdctl.cpp
xrclib_xh_grid.o: $(srcdir)/src/xrc/xh_grid.cpp $(XRCLIB_ODEP)
$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_grid.cpp
xrclib_xh_html.o: $(srcdir)/src/xrc/xh_html.cpp $(XRCLIB_ODEP)
$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_html.cpp
@@ -24457,12 +24452,6 @@ xrclib_xmlres.o: $(srcdir)/src/xrc/xmlres.cpp $(XRCLIB_ODEP)
xrclib_xmlrsall.o: $(srcdir)/src/xrc/xmlrsall.cpp $(XRCLIB_ODEP)
$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xmlrsall.cpp
xrclib_xh_grid.o: $(srcdir)/src/xrc/xh_grid.cpp $(XRCLIB_ODEP)
$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_grid.cpp
xrclib_xh_grid.o: $(srcdir)/src/xrc/xh_grid.cpp $(XRCLIB_ODEP)
$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_grid.cpp
gldll_version_rc.o: $(srcdir)/src/msw/version.rc $(GLDLL_ODEP)
$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_49) $(__EXCEPTIONS_DEFINE_p_49) $(__RTTI_DEFINE_p_49) $(__THREAD_DEFINE_p_49) --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include

2
build/bakefiles/files.bkl
View File

@@ -2632,7 +2632,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/xrc/xh_treebk.cpp
src/xrc/xh_unkwn.cpp
src/xrc/xh_wizrd.cpp
src/xrc/xh_grid.cpp
src/xrc/xmlres.cpp
src/xrc/xmlrsall.cpp
</set>
@@ -2681,7 +2680,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/xrc/xh_treebk.h
wx/xrc/xh_unkwn.h
wx/xrc/xh_wizrd.h
wx/xrc/xh_grid.h
wx/xrc/xmlres.h
</set>

38
build/msw/makefile.bcc
View File

@@ -919,7 +919,6 @@ XRCDLL_OBJECTS = \
$(OBJS)\xrcdll_xh_treebk.obj \
$(OBJS)\xrcdll_xh_unkwn.obj \
$(OBJS)\xrcdll_xh_wizrd.obj \
$(OBJS)\xrcdll_xh_grid.obj \
$(OBJS)\xrcdll_xmlres.obj \
$(OBJS)\xrcdll_xmlrsall.obj
XRCLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
@@ -974,7 +973,6 @@ XRCLIB_OBJECTS = \
$(OBJS)\xrclib_xh_treebk.obj \
$(OBJS)\xrclib_xh_unkwn.obj \
$(OBJS)\xrclib_xh_wizrd.obj \
$(OBJS)\xrclib_xh_grid.obj \
$(OBJS)\xrclib_xmlres.obj \
$(OBJS)\xrclib_xmlrsall.obj
GLDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
@@ -1131,7 +1129,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_xh_treebk.obj \
$(OBJS)\monodll_xh_unkwn.obj \
$(OBJS)\monodll_xh_wizrd.obj \
$(OBJS)\monodll_xh_grid.obj \
$(OBJS)\monodll_xmlres.obj \
$(OBJS)\monodll_xmlrsall.obj
!endif
@@ -1656,7 +1653,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_xh_treebk.obj \
$(OBJS)\monolib_xh_unkwn.obj \
$(OBJS)\monolib_xh_wizrd.obj \
$(OBJS)\monolib_xh_grid.obj \
$(OBJS)\monolib_xmlres.obj \
$(OBJS)\monolib_xmlrsall.obj
!endif
@@ -4532,6 +4528,9 @@ $(OBJS)\monodll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
$(OBJS)\monodll_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_xh_html.obj: ..\..\src\xrc\xh_html.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -5705,11 +5704,6 @@ $(OBJS)\monodll_joystick.obj: ..\..\src\msw\joystick.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
$(OBJS)\monolib_dummy.obj: ..\..\src\msw\dummy.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) -H $**
@@ -6253,6 +6247,9 @@ $(OBJS)\monolib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
$(OBJS)\monolib_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_xh_html.obj: ..\..\src\xrc\xh_html.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -7426,11 +7423,6 @@ $(OBJS)\monolib_joystick.obj: ..\..\src\msw\joystick.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
$(OBJS)\basedll_dummy.obj: ..\..\src\msw\dummy.cpp
$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) -H $**
@@ -10696,6 +10688,9 @@ $(OBJS)\xrcdll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
$(OBJS)\xrcdll_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp
$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $**
$(OBJS)\xrcdll_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $**
$(OBJS)\xrcdll_xh_html.obj: ..\..\src\xrc\xh_html.cpp
$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $**
@@ -10783,12 +10778,6 @@ $(OBJS)\xrcdll_xmlres.obj: ..\..\src\xrc\xmlres.cpp
$(OBJS)\xrcdll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $**
$(OBJS)\xrcdll_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $**
$(OBJS)\xrcdll_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $**
$(OBJS)\xrclib_dummy.obj: ..\..\src\msw\dummy.cpp
$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) -H $**
@@ -10837,6 +10826,9 @@ $(OBJS)\xrclib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
$(OBJS)\xrclib_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp
$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $**
$(OBJS)\xrclib_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $**
$(OBJS)\xrclib_xh_html.obj: ..\..\src\xrc\xh_html.cpp
$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $**
@@ -10924,12 +10916,6 @@ $(OBJS)\xrclib_xmlres.obj: ..\..\src\xrc\xmlres.cpp
$(OBJS)\xrclib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $**
$(OBJS)\xrclib_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $**
$(OBJS)\xrclib_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $**
$(OBJS)\gldll_dummy.obj: ..\..\src\msw\dummy.cpp
$(CXX) -q -c -P -o$@ $(GLDLL_CXXFLAGS) -H $**

38
build/msw/makefile.gcc
View File

@@ -920,7 +920,6 @@ XRCDLL_OBJECTS = \
$(OBJS)\xrcdll_xh_treebk.o \
$(OBJS)\xrcdll_xh_unkwn.o \
$(OBJS)\xrcdll_xh_wizrd.o \
$(OBJS)\xrcdll_xh_grid.o \
$(OBJS)\xrcdll_xmlres.o \
$(OBJS)\xrcdll_xmlrsall.o
XRCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
@@ -975,7 +974,6 @@ XRCLIB_OBJECTS = \
$(OBJS)\xrclib_xh_treebk.o \
$(OBJS)\xrclib_xh_unkwn.o \
$(OBJS)\xrclib_xh_wizrd.o \
$(OBJS)\xrclib_xh_grid.o \
$(OBJS)\xrclib_xmlres.o \
$(OBJS)\xrclib_xmlrsall.o
GLDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
@@ -1140,7 +1138,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_xh_treebk.o \
$(OBJS)\monodll_xh_unkwn.o \
$(OBJS)\monodll_xh_wizrd.o \
$(OBJS)\monodll_xh_grid.o \
$(OBJS)\monodll_xmlres.o \
$(OBJS)\monodll_xmlrsall.o
endif
@@ -1671,7 +1668,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_xh_treebk.o \
$(OBJS)\monolib_xh_unkwn.o \
$(OBJS)\monolib_xh_wizrd.o \
$(OBJS)\monolib_xh_grid.o \
$(OBJS)\monolib_xmlres.o \
$(OBJS)\monolib_xmlrsall.o
endif
@@ -4627,6 +4623,9 @@ $(OBJS)\monodll_xh_gauge.o: ../../src/xrc/xh_gauge.cpp
$(OBJS)\monodll_xh_gdctl.o: ../../src/xrc/xh_gdctl.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_xh_grid.o: ../../src/xrc/xh_grid.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_xh_html.o: ../../src/xrc/xh_html.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -5900,11 +5899,6 @@ $(OBJS)\monodll_joystick.o: ../../src/msw/joystick.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_xh_grid.o: ../../src/xrc/xh_grid.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
$(OBJS)\monolib_dummy.o: ../../src/msw/dummy.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -6448,6 +6442,9 @@ $(OBJS)\monolib_xh_gauge.o: ../../src/xrc/xh_gauge.cpp
$(OBJS)\monolib_xh_gdctl.o: ../../src/xrc/xh_gdctl.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_xh_grid.o: ../../src/xrc/xh_grid.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_xh_html.o: ../../src/xrc/xh_html.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -7721,11 +7718,6 @@ $(OBJS)\monolib_joystick.o: ../../src/msw/joystick.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_xh_grid.o: ../../src/xrc/xh_grid.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
$(OBJS)\basedll_dummy.o: ../../src/msw/dummy.cpp
$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -11191,6 +11183,9 @@ $(OBJS)\xrcdll_xh_gauge.o: ../../src/xrc/xh_gauge.cpp
$(OBJS)\xrcdll_xh_gdctl.o: ../../src/xrc/xh_gdctl.cpp
$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrcdll_xh_grid.o: ../../src/xrc/xh_grid.cpp
$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrcdll_xh_html.o: ../../src/xrc/xh_html.cpp
$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -11278,12 +11273,6 @@ $(OBJS)\xrcdll_xmlres.o: ../../src/xrc/xmlres.cpp
$(OBJS)\xrcdll_xmlrsall.o: ../../src/xrc/xmlrsall.cpp
$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrcdll_xh_grid.o: ../../src/xrc/xh_grid.cpp
$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrcdll_xh_grid.o: ../../src/xrc/xh_grid.cpp
$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrclib_dummy.o: ../../src/msw/dummy.cpp
$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -11332,6 +11321,9 @@ $(OBJS)\xrclib_xh_gauge.o: ../../src/xrc/xh_gauge.cpp
$(OBJS)\xrclib_xh_gdctl.o: ../../src/xrc/xh_gdctl.cpp
$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrclib_xh_grid.o: ../../src/xrc/xh_grid.cpp
$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrclib_xh_html.o: ../../src/xrc/xh_html.cpp
$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -11419,12 +11411,6 @@ $(OBJS)\xrclib_xmlres.o: ../../src/xrc/xmlres.cpp
$(OBJS)\xrclib_xmlrsall.o: ../../src/xrc/xmlrsall.cpp
$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrclib_xh_grid.o: ../../src/xrc/xh_grid.cpp
$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrclib_xh_grid.o: ../../src/xrc/xh_grid.cpp
$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\gldll_dummy.o: ../../src/msw/dummy.cpp
$(CXX) -c -o $@ $(GLDLL_CXXFLAGS) $(CPPDEPS) $<

38
build/msw/makefile.vc
View File

@@ -1001,7 +1001,6 @@ XRCDLL_OBJECTS = \
$(OBJS)\xrcdll_xh_treebk.obj \
$(OBJS)\xrcdll_xh_unkwn.obj \
$(OBJS)\xrcdll_xh_wizrd.obj \
$(OBJS)\xrcdll_xh_grid.obj \
$(OBJS)\xrcdll_xmlres.obj \
$(OBJS)\xrcdll_xmlrsall.obj
XRCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_397)$(__DEBUGRUNTIME) /DWIN32 \
@@ -1059,7 +1058,6 @@ XRCLIB_OBJECTS = \
$(OBJS)\xrclib_xh_treebk.obj \
$(OBJS)\xrclib_xh_unkwn.obj \
$(OBJS)\xrclib_xh_wizrd.obj \
$(OBJS)\xrclib_xh_grid.obj \
$(OBJS)\xrclib_xmlres.obj \
$(OBJS)\xrclib_xmlrsall.obj
GLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_411)$(__DEBUGRUNTIME) /DWIN32 \
@@ -1277,7 +1275,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_xh_treebk.obj \
$(OBJS)\monodll_xh_unkwn.obj \
$(OBJS)\monodll_xh_wizrd.obj \
$(OBJS)\monodll_xh_grid.obj \
$(OBJS)\monodll_xmlres.obj \
$(OBJS)\monodll_xmlrsall.obj
!endif
@@ -1808,7 +1805,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_xh_treebk.obj \
$(OBJS)\monolib_xh_unkwn.obj \
$(OBJS)\monolib_xh_wizrd.obj \
$(OBJS)\monolib_xh_grid.obj \
$(OBJS)\monolib_xmlres.obj \
$(OBJS)\monolib_xmlrsall.obj
!endif
@@ -4828,6 +4824,9 @@ $(OBJS)\monodll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
$(OBJS)\monodll_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_xh_html.obj: ..\..\src\xrc\xh_html.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6001,11 +6000,6 @@ $(OBJS)\monodll_joystick.obj: ..\..\src\msw\joystick.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
$(OBJS)\monolib_dummy.obj: ..\..\src\msw\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) /Ycwx/wxprec.h $**
@@ -6549,6 +6543,9 @@ $(OBJS)\monolib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
$(OBJS)\monolib_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_xh_html.obj: ..\..\src\xrc\xh_html.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -7722,11 +7719,6 @@ $(OBJS)\monolib_joystick.obj: ..\..\src\msw\joystick.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
$(OBJS)\basedll_dummy.obj: ..\..\src\msw\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) /Ycwx/wxprec.h $**
@@ -10992,6 +10984,9 @@ $(OBJS)\xrcdll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
$(OBJS)\xrcdll_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
$(OBJS)\xrcdll_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
$(OBJS)\xrcdll_xh_html.obj: ..\..\src\xrc\xh_html.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
@@ -11079,12 +11074,6 @@ $(OBJS)\xrcdll_xmlres.obj: ..\..\src\xrc\xmlres.cpp
$(OBJS)\xrcdll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
$(OBJS)\xrcdll_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
$(OBJS)\xrcdll_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
$(OBJS)\xrclib_dummy.obj: ..\..\src\msw\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) /Ycwx/wxprec.h $**
@@ -11133,6 +11122,9 @@ $(OBJS)\xrclib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
$(OBJS)\xrclib_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
$(OBJS)\xrclib_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
$(OBJS)\xrclib_xh_html.obj: ..\..\src\xrc\xh_html.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
@@ -11220,12 +11212,6 @@ $(OBJS)\xrclib_xmlres.obj: ..\..\src\xrc\xmlres.cpp
$(OBJS)\xrclib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
$(OBJS)\xrclib_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
$(OBJS)\xrclib_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
$(OBJS)\gldll_dummy.obj: ..\..\src\msw\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) /Ycwx/wxprec.h $**

3798
build/msw/makefile.wat
View File

File diff suppressed because it is too large Load Diff

51
build/msw/wx_xrc.dsp
View File

@@ -1195,57 +1195,6 @@ SOURCE=..\..\src\xrc\xh_gdctl.cpp
# Begin Source File
SOURCE=..\..\src\xrc\xh_grid.cpp
!IF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Release"
!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Debug"
!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Release"
!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Debug"
!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Release"
!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Debug"
!ELSEIF "$(CFG)" == "xrc - Win32 DLL Release"
!ELSEIF "$(CFG)" == "xrc - Win32 DLL Debug"
!ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Release"
!ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Debug"
!ELSEIF "$(CFG)" == "xrc - Win32 Universal Release"
!ELSEIF "$(CFG)" == "xrc - Win32 Universal Debug"
!ELSEIF "$(CFG)" == "xrc - Win32 Unicode Release"
!ELSEIF "$(CFG)" == "xrc - Win32 Unicode Debug"
!ELSEIF "$(CFG)" == "xrc - Win32 Release"
!ELSEIF "$(CFG)" == "xrc - Win32 Debug"
!ENDIF
# End Source File
# Begin Source File

4
samples/html/test/f.html
View File

@@ -1,5 +1,7 @@
<HTML>
<head><title>wxWindow</title></head>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>wxWindow</title></head>
<BODY BGCOLOR="#FFFFFF">
<A NAME="wxwindow"></A><CENTER>
<A HREF="http://www.wx.org/wx.zip#zip:wx.htm#anchor">Contents</A> <A HREF="wx22.htm#classref">Up</A> <A HREF="wx259.htm#wxwave">&lt;&lt;</A> <A HREF="wx261.htm#wxwindowdc">&gt;&gt;</A> </CENTER><HR>

8
src/wxWindows.dsp
View File

@@ -1719,6 +1719,10 @@ SOURCE=.\xrc\xh_gdctl.cpp
# End Source File
# Begin Source File
SOURCE=.\xrc\xh_grid.cpp
# End Source File
# Begin Source File
SOURCE=.\xrc\xh_html.cpp
# End Source File
# Begin Source File
@@ -3139,6 +3143,10 @@ SOURCE=..\include\wx\xrc\xh_gdctl.h
# End Source File
# Begin Source File
SOURCE=..\include\wx\xrc\xh_grid.h
# End Source File
# Begin Source File
SOURCE=..\include\wx\xrc\xh_html.h
# End Source File
# Begin Source File