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

Add XRC handlers for wxDataViewCtrl and related classes

Browse Source 
The same handler is also used for wxDataViewListCtrl and
wxDataViewTreeCtrl.

Closes #18424.
This commit is contained in:
Anton Triest
2019-06-27 12:39:53 +02:00
committed by Vadim Zeitlin
parent 6ee5184171
commit 584e2715eb
21 changed files with 315 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile.in
View File

@@ -1747,6 +1747,7 @@ XRCDLL_OBJECTS = \
xrcdll_xh_collpane.o \
xrcdll_xh_combo.o \
xrcdll_xh_comboctrl.o \
xrcdll_xh_dataview.o \
xrcdll_xh_datectrl.o \
xrcdll_xh_dirpicker.o \
xrcdll_xh_dlg.o \
@@ -1821,6 +1822,7 @@ XRCLIB_OBJECTS = \
xrclib_xh_collpane.o \
xrclib_xh_combo.o \
xrclib_xh_comboctrl.o \
xrclib_xh_dataview.o \
xrclib_xh_datectrl.o \
xrclib_xh_dirpicker.o \
xrclib_xh_dlg.o \
@@ -3998,6 +4000,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \
wx/xrc/xh_collpane.h \
wx/xrc/xh_combo.h \
wx/xrc/xh_comboctrl.h \
wx/xrc/xh_dataview.h \
wx/xrc/xh_datectrl.h \
wx/xrc/xh_dirpicker.h \
wx/xrc/xh_dlg.h \
@@ -4305,6 +4308,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \
monodll_xh_collpane.o \
monodll_xh_combo.o \
monodll_xh_comboctrl.o \
monodll_xh_dataview.o \
monodll_xh_datectrl.o \
monodll_xh_dirpicker.o \
monodll_xh_dlg.o \
@@ -6289,6 +6293,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \
monolib_xh_collpane.o \
monolib_xh_combo.o \
monolib_xh_comboctrl.o \
monolib_xh_dataview.o \
monolib_xh_datectrl.o \
monolib_xh_dirpicker.o \
monolib_xh_dlg.o \
@@ -17163,6 +17168,9 @@ monodll_xh_combo.o: $(srcdir)/src/xrc/xh_combo.cpp $(MONODLL_ODEP)
monodll_xh_comboctrl.o: $(srcdir)/src/xrc/xh_comboctrl.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_comboctrl.cpp
monodll_xh_dataview.o: $(srcdir)/src/xrc/xh_dataview.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_dataview.cpp
monodll_xh_datectrl.o: $(srcdir)/src/xrc/xh_datectrl.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_datectrl.cpp
@@ -22425,6 +22433,9 @@ monolib_xh_combo.o: $(srcdir)/src/xrc/xh_combo.cpp $(MONOLIB_ODEP)
monolib_xh_comboctrl.o: $(srcdir)/src/xrc/xh_comboctrl.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_comboctrl.cpp
monolib_xh_dataview.o: $(srcdir)/src/xrc/xh_dataview.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_dataview.cpp
monolib_xh_datectrl.o: $(srcdir)/src/xrc/xh_datectrl.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_datectrl.cpp
@@ -36024,6 +36035,9 @@ xrcdll_xh_combo.o: $(srcdir)/src/xrc/xh_combo.cpp $(XRCDLL_ODEP)
xrcdll_xh_comboctrl.o: $(srcdir)/src/xrc/xh_comboctrl.cpp $(XRCDLL_ODEP)
$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_comboctrl.cpp
xrcdll_xh_dataview.o: $(srcdir)/src/xrc/xh_dataview.cpp $(XRCDLL_ODEP)
$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_dataview.cpp
xrcdll_xh_datectrl.o: $(srcdir)/src/xrc/xh_datectrl.cpp $(XRCDLL_ODEP)
$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_datectrl.cpp
@@ -36225,6 +36239,9 @@ xrclib_xh_combo.o: $(srcdir)/src/xrc/xh_combo.cpp $(XRCLIB_ODEP)
xrclib_xh_comboctrl.o: $(srcdir)/src/xrc/xh_comboctrl.cpp $(XRCLIB_ODEP)
$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_comboctrl.cpp
xrclib_xh_dataview.o: $(srcdir)/src/xrc/xh_dataview.cpp $(XRCLIB_ODEP)
$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_dataview.cpp
xrclib_xh_datectrl.o: $(srcdir)/src/xrc/xh_datectrl.cpp $(XRCLIB_ODEP)
$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_datectrl.cpp

2
build/bakefiles/files.bkl
View File

@@ -3081,6 +3081,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/xrc/xh_collpane.cpp
src/xrc/xh_combo.cpp
src/xrc/xh_comboctrl.cpp
src/xrc/xh_dataview.cpp
src/xrc/xh_datectrl.cpp
src/xrc/xh_dirpicker.cpp
src/xrc/xh_dlg.cpp
@@ -3151,6 +3152,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/xrc/xh_collpane.h
wx/xrc/xh_combo.h
wx/xrc/xh_comboctrl.h
wx/xrc/xh_dataview.h
wx/xrc/xh_datectrl.h
wx/xrc/xh_dirpicker.h
wx/xrc/xh_dlg.h

2
build/cmake/files.cmake
View File

@@ -2946,6 +2946,7 @@ set(XRC_SRC
src/xrc/xmlres.cpp
src/xrc/xmladv.cpp
src/xrc/xmlrsall.cpp
src/xrc/xh_dataview.cpp
)
set(XRC_HDR
@@ -3015,6 +3016,7 @@ set(XRC_HDR
wx/xrc/xh_unkwn.h
wx/xrc/xh_wizrd.h
wx/xrc/xmlres.h
wx/xrc/xh_dataview.h
)
set(XML_SRC

2
build/files
View File

@@ -2839,6 +2839,7 @@ XRC_SRC =
src/xrc/xh_collpane.cpp
src/xrc/xh_combo.cpp
src/xrc/xh_comboctrl.cpp
src/xrc/xh_dataview.cpp
src/xrc/xh_datectrl.cpp
src/xrc/xh_dirpicker.cpp
src/xrc/xh_dlg.cpp
@@ -2908,6 +2909,7 @@ XRC_HDR =
wx/xrc/xh_collpane.h
wx/xrc/xh_combo.h
wx/xrc/xh_comboctrl.h
wx/xrc/xh_dataview.h
wx/xrc/xh_datectrl.h
wx/xrc/xh_dirpicker.h
wx/xrc/xh_dlg.h

16
build/msw/makefile.bcc
View File

@@ -1224,6 +1224,7 @@ XRCDLL_OBJECTS = \
$(OBJS)\xrcdll_xh_collpane.obj \
$(OBJS)\xrcdll_xh_combo.obj \
$(OBJS)\xrcdll_xh_comboctrl.obj \
$(OBJS)\xrcdll_xh_dataview.obj \
$(OBJS)\xrcdll_xh_datectrl.obj \
$(OBJS)\xrcdll_xh_dirpicker.obj \
$(OBJS)\xrcdll_xh_dlg.obj \
@@ -1301,6 +1302,7 @@ XRCLIB_OBJECTS = \
$(OBJS)\xrclib_xh_collpane.obj \
$(OBJS)\xrclib_xh_combo.obj \
$(OBJS)\xrclib_xh_comboctrl.obj \
$(OBJS)\xrclib_xh_dataview.obj \
$(OBJS)\xrclib_xh_datectrl.obj \
$(OBJS)\xrclib_xh_dirpicker.obj \
$(OBJS)\xrclib_xh_dlg.obj \
@@ -1694,6 +1696,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_xh_collpane.obj \
$(OBJS)\monodll_xh_combo.obj \
$(OBJS)\monodll_xh_comboctrl.obj \
$(OBJS)\monodll_xh_dataview.obj \
$(OBJS)\monodll_xh_datectrl.obj \
$(OBJS)\monodll_xh_dirpicker.obj \
$(OBJS)\monodll_xh_dlg.obj \
@@ -2525,6 +2528,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_xh_collpane.obj \
$(OBJS)\monolib_xh_combo.obj \
$(OBJS)\monolib_xh_comboctrl.obj \
$(OBJS)\monolib_xh_dataview.obj \
$(OBJS)\monolib_xh_datectrl.obj \
$(OBJS)\monolib_xh_dirpicker.obj \
$(OBJS)\monolib_xh_dlg.obj \
@@ -7292,6 +7296,9 @@ $(OBJS)\monodll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
$(OBJS)\monodll_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp
$(OBJS)\monodll_xh_dataview.obj: ..\..\src\xrc\xh_dataview.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_dataview.cpp
$(OBJS)\monodll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
@@ -9838,6 +9845,9 @@ $(OBJS)\monolib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
$(OBJS)\monolib_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp
$(OBJS)\monolib_xh_dataview.obj: ..\..\src\xrc\xh_dataview.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_dataview.cpp
$(OBJS)\monolib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
@@ -16084,6 +16094,9 @@ $(OBJS)\xrcdll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
$(OBJS)\xrcdll_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp
$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp
$(OBJS)\xrcdll_xh_dataview.obj: ..\..\src\xrc\xh_dataview.cpp
$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_dataview.cpp
$(OBJS)\xrcdll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
@@ -16288,6 +16301,9 @@ $(OBJS)\xrclib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
$(OBJS)\xrclib_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp
$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp
$(OBJS)\xrclib_xh_dataview.obj: ..\..\src\xrc\xh_dataview.cpp
$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_dataview.cpp
$(OBJS)\xrclib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp

16
build/msw/makefile.gcc
View File

@@ -1231,6 +1231,7 @@ XRCDLL_OBJECTS = \
$(OBJS)\xrcdll_xh_collpane.o \
$(OBJS)\xrcdll_xh_combo.o \
$(OBJS)\xrcdll_xh_comboctrl.o \
$(OBJS)\xrcdll_xh_dataview.o \
$(OBJS)\xrcdll_xh_datectrl.o \
$(OBJS)\xrcdll_xh_dirpicker.o \
$(OBJS)\xrcdll_xh_dlg.o \
@@ -1308,6 +1309,7 @@ XRCLIB_OBJECTS = \
$(OBJS)\xrclib_xh_collpane.o \
$(OBJS)\xrclib_xh_combo.o \
$(OBJS)\xrclib_xh_comboctrl.o \
$(OBJS)\xrclib_xh_dataview.o \
$(OBJS)\xrclib_xh_datectrl.o \
$(OBJS)\xrclib_xh_dirpicker.o \
$(OBJS)\xrclib_xh_dlg.o \
@@ -1719,6 +1721,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_xh_collpane.o \
$(OBJS)\monodll_xh_combo.o \
$(OBJS)\monodll_xh_comboctrl.o \
$(OBJS)\monodll_xh_dataview.o \
$(OBJS)\monodll_xh_datectrl.o \
$(OBJS)\monodll_xh_dirpicker.o \
$(OBJS)\monodll_xh_dlg.o \
@@ -2556,6 +2559,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_xh_collpane.o \
$(OBJS)\monolib_xh_combo.o \
$(OBJS)\monolib_xh_comboctrl.o \
$(OBJS)\monolib_xh_dataview.o \
$(OBJS)\monolib_xh_datectrl.o \
$(OBJS)\monolib_xh_dirpicker.o \
$(OBJS)\monolib_xh_dlg.o \
@@ -7474,6 +7478,9 @@ $(OBJS)\monodll_xh_combo.o: ../../src/xrc/xh_combo.cpp
$(OBJS)\monodll_xh_comboctrl.o: ../../src/xrc/xh_comboctrl.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_xh_dataview.o: ../../src/xrc/xh_dataview.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_xh_datectrl.o: ../../src/xrc/xh_datectrl.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -10020,6 +10027,9 @@ $(OBJS)\monolib_xh_combo.o: ../../src/xrc/xh_combo.cpp
$(OBJS)\monolib_xh_comboctrl.o: ../../src/xrc/xh_comboctrl.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_xh_dataview.o: ../../src/xrc/xh_dataview.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_xh_datectrl.o: ../../src/xrc/xh_datectrl.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -16266,6 +16276,9 @@ $(OBJS)\xrcdll_xh_combo.o: ../../src/xrc/xh_combo.cpp
$(OBJS)\xrcdll_xh_comboctrl.o: ../../src/xrc/xh_comboctrl.cpp
$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrcdll_xh_dataview.o: ../../src/xrc/xh_dataview.cpp
$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrcdll_xh_datectrl.o: ../../src/xrc/xh_datectrl.cpp
$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -16470,6 +16483,9 @@ $(OBJS)\xrclib_xh_combo.o: ../../src/xrc/xh_combo.cpp
$(OBJS)\xrclib_xh_comboctrl.o: ../../src/xrc/xh_comboctrl.cpp
$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrclib_xh_dataview.o: ../../src/xrc/xh_dataview.cpp
$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\xrclib_xh_datectrl.o: ../../src/xrc/xh_datectrl.cpp
$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<

16
build/msw/makefile.vc
View File

@@ -1361,6 +1361,7 @@ XRCDLL_OBJECTS = \
$(OBJS)\xrcdll_xh_collpane.obj \
$(OBJS)\xrcdll_xh_combo.obj \
$(OBJS)\xrcdll_xh_comboctrl.obj \
$(OBJS)\xrcdll_xh_dataview.obj \
$(OBJS)\xrcdll_xh_datectrl.obj \
$(OBJS)\xrcdll_xh_dirpicker.obj \
$(OBJS)\xrcdll_xh_dlg.obj \
@@ -1444,6 +1445,7 @@ XRCLIB_OBJECTS = \
$(OBJS)\xrclib_xh_collpane.obj \
$(OBJS)\xrclib_xh_combo.obj \
$(OBJS)\xrclib_xh_comboctrl.obj \
$(OBJS)\xrclib_xh_dataview.obj \
$(OBJS)\xrclib_xh_datectrl.obj \
$(OBJS)\xrclib_xh_dirpicker.obj \
$(OBJS)\xrclib_xh_dlg.obj \
@@ -2011,6 +2013,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_xh_collpane.obj \
$(OBJS)\monodll_xh_combo.obj \
$(OBJS)\monodll_xh_comboctrl.obj \
$(OBJS)\monodll_xh_dataview.obj \
$(OBJS)\monodll_xh_datectrl.obj \
$(OBJS)\monodll_xh_dirpicker.obj \
$(OBJS)\monodll_xh_dlg.obj \
@@ -2848,6 +2851,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_xh_collpane.obj \
$(OBJS)\monolib_xh_combo.obj \
$(OBJS)\monolib_xh_comboctrl.obj \
$(OBJS)\monolib_xh_dataview.obj \
$(OBJS)\monolib_xh_datectrl.obj \
$(OBJS)\monolib_xh_dirpicker.obj \
$(OBJS)\monolib_xh_dlg.obj \
@@ -8001,6 +8005,9 @@ $(OBJS)\monodll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
$(OBJS)\monodll_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp
$(OBJS)\monodll_xh_dataview.obj: ..\..\src\xrc\xh_dataview.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_dataview.cpp
$(OBJS)\monodll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
@@ -10547,6 +10554,9 @@ $(OBJS)\monolib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
$(OBJS)\monolib_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp
$(OBJS)\monolib_xh_dataview.obj: ..\..\src\xrc\xh_dataview.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_dataview.cpp
$(OBJS)\monolib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
@@ -16793,6 +16803,9 @@ $(OBJS)\xrcdll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
$(OBJS)\xrcdll_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp
$(OBJS)\xrcdll_xh_dataview.obj: ..\..\src\xrc\xh_dataview.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_dataview.cpp
$(OBJS)\xrcdll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
@@ -16997,6 +17010,9 @@ $(OBJS)\xrclib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
$(OBJS)\xrclib_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp
$(OBJS)\xrclib_xh_dataview.obj: ..\..\src\xrc\xh_dataview.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_dataview.cpp
$(OBJS)\xrclib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp

3
build/msw/wx_vc7_core.vcproj
View File

@@ -2969,6 +2969,9 @@
<File
RelativePath="..\..\include\wx\xrc\xh_comboctrl.h">
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_dataview.h">
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_datectrl.h">
</File>

6
build/msw/wx_vc7_xrc.vcproj
View File

@@ -467,6 +467,9 @@
<File
RelativePath="..\..\include\wx\xrc\xh_comboctrl.h">
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_dataview.h">
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_datectrl.h">
</File>
@@ -667,6 +670,9 @@
<File
RelativePath="..\..\src\xrc\xh_comboctrl.cpp">
</File>
<File
RelativePath="..\..\src\xrc\xh_dataview.cpp">
</File>
<File
RelativePath="..\..\src\xrc\xh_datectrl.cpp">
</File>

4
build/msw/wx_vc8_core.vcproj
View File

@@ -4460,6 +4460,10 @@
RelativePath="..\..\include\wx\xrc\xh_comboctrl.h"
>
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_dataview.h"
>
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_datectrl.h"
>

8
build/msw/wx_vc8_xrc.vcproj
View File

@@ -1125,6 +1125,10 @@
RelativePath="..\..\include\wx\xrc\xh_comboctrl.h"
>
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_dataview.h"
>
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_datectrl.h"
>
@@ -1391,6 +1395,10 @@
RelativePath="..\..\src\xrc\xh_comboctrl.cpp"
>
</File>
<File
RelativePath="..\..\src\xrc\xh_dataview.cpp"
>
</File>
<File
RelativePath="..\..\src\xrc\xh_datectrl.cpp"
>

4
build/msw/wx_vc9_core.vcproj
View File

@@ -4456,6 +4456,10 @@
RelativePath="..\..\include\wx\xrc\xh_comboctrl.h"
>
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_dataview.h"
>
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_datectrl.h"
>

8
build/msw/wx_vc9_xrc.vcproj
View File

@@ -1121,6 +1121,10 @@
RelativePath="..\..\include\wx\xrc\xh_comboctrl.h"
>
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_dataview.h"
>
</File>
<File
RelativePath="..\..\include\wx\xrc\xh_datectrl.h"
>
@@ -1387,6 +1391,10 @@
RelativePath="..\..\src\xrc\xh_comboctrl.cpp"
>
</File>
<File
RelativePath="..\..\src\xrc\xh_dataview.cpp"
>
</File>
<File
RelativePath="..\..\src\xrc\xh_datectrl.cpp"
>

2
build/msw/wx_xrc.vcxproj
View File

@@ -523,6 +523,7 @@
<ClCompile Include="..\..\src\xrc\xmlres.cpp" />
<ClCompile Include="..\..\src\xrc\xmlrsall.cpp" />
<ClCompile Include="..\..\src\xrc\xh_activityindicator.cpp" />
<ClCompile Include="..\..\src\xrc\xh_dataview.cpp" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\src\msw\version.rc">
@@ -619,6 +620,7 @@
<ClInclude Include="..\..\include\wx\xrc\xh_wizrd.h" />
<ClInclude Include="..\..\include\wx\xrc\xmlres.h" />
<ClInclude Include="..\..\include\wx\xrc\xh_activityindicator.h" />
<ClInclude Include="..\..\include\wx\xrc\xh_dataview.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

6
build/msw/wx_xrc.vcxproj.filters
View File

@@ -76,6 +76,9 @@
<ClCompile Include="..\..\src\xrc\xh_comboctrl.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\xrc\xh_dataview.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\xrc\xh_datectrl.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -287,6 +290,9 @@
<ClInclude Include="..\..\include\wx\xrc\xh_comboctrl.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\xrc\xh_dataview.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\xrc\xh_datectrl.h">
<Filter>Common Headers</Filter>
</ClInclude>

19
docs/doxygen/overviews/xrc_format.h
View File

@@ -1021,6 +1021,25 @@ Example:
@endTable
@subsubsection xrc_wxdataviewctrl wxDataViewCtrl
No additional properties.
@subsubsection xrc_wxdataviewlistctrl wxDataViewListCtrl
No additional properties.
@subsubsection xrc_wxdataviewtreectrl wxDataViewTreeCtrl
@beginTable
@hdr3col{property, type, description}
@row3col{imagelist, @ref overview_xrcformat_type_imagelist,
Image list to use for the images (default: none).}
@endTable
@subsubsection xrc_wxdatepickerctrl wxDatePickerCtrl
No additional properties.

1
include/wx/xrc/xh_all.h
View File

@@ -30,6 +30,7 @@
#include "wx/xrc/xh_collpane.h"
#include "wx/xrc/xh_combo.h"
#include "wx/xrc/xh_comboctrl.h"
#include "wx/xrc/xh_dataview.h"
#include "wx/xrc/xh_datectrl.h"
#include "wx/xrc/xh_dirpicker.h"
#include "wx/xrc/xh_dlg.h"

34
include/wx/xrc/xh_dataview.h Normal file
View File

@@ -0,0 +1,34 @@
/////////////////////////////////////////////////////////////////////////////
// Name: wx/xrc/xh_dataview.h
// Purpose: XML resource handler for wxDataViewCtrl
// Author: Anton Triest
// Created: 2019/06/27
// Copyright: (c) 2019 Anton Triest, Bricsys
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_XH_DATAVIEW_H_
#define _WX_XH_DATAVIEW_H_
#include "wx/xrc/xmlres.h"
#if wxUSE_XRC && wxUSE_DATAVIEWCTRL
class WXDLLIMPEXP_XRC wxDataViewXmlHandler : public wxXmlResourceHandler
{
wxDECLARE_DYNAMIC_CLASS(wxDataViewXmlHandler);
public:
wxDataViewXmlHandler();
virtual wxObject *DoCreateResource() wxOVERRIDE;
virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
private:
wxObject* HandleCtrl();
wxObject* HandleListCtrl();
wxObject* HandleTreeCtrl();
};
#endif // wxUSE_XRC && wxUSE_DATAVIEWCTRL
#endif // _WX_XH_DATAVIEW_H_

31
misc/schema/xrc_schema.rnc
View File

@@ -177,6 +177,9 @@ builtinWindowClasses =
| wxColourPickerCtrl
| wxComboBox
| wxComboCtrl
| wxDataViewCtrl
| wxDataViewListCtrl
| wxDataViewTreeCtrl
| wxDatePickerCtrl
| wxDialog
| wxDirPickerCtrl
@@ -274,6 +277,9 @@ builtinClassesNames =
| "wxColourPickerCtrl"
| "wxComboBox"
| "wxComboCtrl"
| "wxDataViewCtrl"
| "wxDataViewListCtrl"
| "wxDataViewTreeCtrl"
| "wxDatePickerCtrl"
| "wxDialog"
| "wxDirPickerCtrl"
@@ -849,6 +855,31 @@ wxComboCtrl =
}
wxDataViewCtrl =
element object {
attribute class { "wxDataViewCtrl" } &
stdObjectNodeAttributes &
stdWindowProperties
}
wxDataViewListCtrl =
element object {
attribute class { "wxDataViewListCtrl" } &
stdObjectNodeAttributes &
stdWindowProperties
}
wxDataViewTreeCtrl =
element object {
attribute class { "wxDataViewTreeCtrl" } &
stdObjectNodeAttributes &
stdWindowProperties &
[xrc:p="o"] element imagelist {_, t_imagelist }*
}
wxDatePickerCtrl =
element object {
attribute class { "wxDatePickerCtrl" } &

115
src/xrc/xh_dataview.cpp Normal file
View File

@@ -0,0 +1,115 @@
/////////////////////////////////////////////////////////////////////////////
// Name: src/xrc/xh_dataview.cpp
// Purpose: XRC resource for wxDataViewCtrl
// Author: Anton Triest
// Created: 2019/06/27
// Copyright: (c) 2019 Anton Triest, Bricsys
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#if wxUSE_XRC && wxUSE_DATAVIEWCTRL
#include "wx/xrc/xh_dataview.h"
#include "wx/dataview.h"
wxIMPLEMENT_DYNAMIC_CLASS(wxDataViewXmlHandler, wxXmlResourceHandler);
wxDataViewXmlHandler::wxDataViewXmlHandler()
: wxXmlResourceHandler()
{
XRC_ADD_STYLE(wxDV_SINGLE);
XRC_ADD_STYLE(wxDV_MULTIPLE);
XRC_ADD_STYLE(wxDV_NO_HEADER);
XRC_ADD_STYLE(wxDV_HORIZ_RULES);
XRC_ADD_STYLE(wxDV_VERT_RULES);
XRC_ADD_STYLE(wxDV_ROW_LINES);
XRC_ADD_STYLE(wxDV_VARIABLE_LINE_HEIGHT);
AddWindowStyles();
}
wxObject *wxDataViewXmlHandler::DoCreateResource()
{
if (m_class == "wxDataViewCtrl")
{
return HandleCtrl();
}
else if (m_class == "wxDataViewListCtrl")
{
return HandleListCtrl();
}
else if (m_class == "wxDataViewTreeCtrl")
{
return HandleTreeCtrl();
}
return NULL;
}
bool wxDataViewXmlHandler::CanHandle(wxXmlNode *node)
{
return IsOfClass(node, "wxDataViewCtrl") ||
IsOfClass(node, "wxDataViewListCtrl") ||
IsOfClass(node, "wxDataViewTreeCtrl");
}
wxObject* wxDataViewXmlHandler::HandleCtrl()
{
XRC_MAKE_INSTANCE(control, wxDataViewCtrl)
control->Create(m_parentAsWindow,
GetID(),
GetPosition(),
GetSize(),
GetStyle(),
wxDefaultValidator,
GetName());
SetupWindow(control);
return control;
}
wxObject* wxDataViewXmlHandler::HandleListCtrl()
{
XRC_MAKE_INSTANCE(control, wxDataViewListCtrl)
control->Create(m_parentAsWindow,
GetID(),
GetPosition(),
GetSize(),
GetStyle(),
wxDefaultValidator);
SetupWindow(control);
return control;
}
wxObject* wxDataViewXmlHandler::HandleTreeCtrl()
{
XRC_MAKE_INSTANCE(control, wxDataViewTreeCtrl)
control->Create(m_parentAsWindow,
GetID(),
GetPosition(),
GetSize(),
GetStyle(),
wxDefaultValidator);
wxImageList *imagelist = GetImageList();
if (imagelist)
control->AssignImageList(imagelist);
SetupWindow(control);
return control;
}
#endif // wxUSE_XRC && wxUSE_DATAVIEWCTRL

3
src/xrc/xmlrsall.cpp
View File

@@ -86,6 +86,9 @@ void wxXmlResource::InitAllHandlers()
#if wxUSE_COMMANDLINKBUTTON
AddHandler(new wxCommandLinkButtonXmlHandler);
#endif
#if wxUSE_DATAVIEWCTRL
AddHandler(new wxDataViewXmlHandler);
#endif
#if wxUSE_DATEPICKCTRL
AddHandler(new wxDateCtrlXmlHandler);
#endif