Merge branch 'qt_tree_control' of https://github.com/GeoTeric/wxWidgets into qt-fixes

See https://github.com/wxWidgets/wxWidgets/pull/1225
This commit is contained in:
Vadim Zeitlin
2019-06-29 19:21:07 +02:00
15 changed files with 1466 additions and 249 deletions

View File

@@ -347,7 +347,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/qt/toolbar.h
wx/qt/tooltip.h
wx/qt/toplevel.h
<!-- wx/qt/treectrl.h -->
wx/qt/window.h
wx/generic/fdrepdlg.h
wx/generic/filepickerg.h
@@ -362,6 +361,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/qt/dataview.h
wx/qt/dvrenderers.h
$(QT_PLATFORM_HDR)
wx/qt/treectrl.h
wx/qt/private/winevent.h
wx/qt/private/converter.h
wx/qt/private/treeitemdelegate.h
wx/qt/private/treeitemfactory.h
wx/qt/private/pointer.h
wx/qt/private/timer.h
wx/qt/private/utils.h
</set>
<set var="QT_SRC" hints="files">
@@ -460,6 +467,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/qt/utils.cpp
src/qt/window.cpp
$(QT_PLATFORM_SRC)
src/qt/treectrl.cpp
</set>
<set var="MEDIA_QT_SRC" hints="files">

View File

@@ -276,6 +276,14 @@ set(QT_HDR
wx/qt/dataview.h
wx/generic/activityindicator.h
${QT_PLATFORM_HDR}
wx/qt/treectrl.h
wx/qt/private/converter.h
wx/qt/private/winevent.h
wx/qt/private/timer.h
wx/qt/private/pointer.h
wx/qt/private/treeitemdelegate.h
wx/qt/private/treeitemfactory.h
wx/qt/private/utils.h
)
set(QT_SRC
@@ -374,6 +382,7 @@ set(QT_SRC
src/qt/dataview.cpp
src/qt/taskbar.cpp
${QT_PLATFORM_SRC}
src/qt/treectrl.cpp
)
set(MEDIA_QT_SRC

View File

@@ -297,7 +297,17 @@ QT_HDR =
wx/qt/toolbar.h
wx/qt/tooltip.h
wx/qt/toplevel.h
wx/qt/treectrl.h
wx/qt/window.h
wx/qt/private/converter.h
wx/qt/private/winevent.h
wx/qt/private/winevent.h
wx/qt/private/converter.h
wx/qt/private/pointer.h
wx/qt/private/timer.h
wx/qt/private/treeitemdelegate.h
wx/qt/private/treeitemfactory.h
wx/qt/private/utils.h
QT_SRC=
$(QT_PLATFORM_SRC)
@@ -392,6 +402,7 @@ QT_SRC=
src/qt/toolbar.cpp
src/qt/tooltip.cpp
src/qt/toplevel.cpp
src/qt/treectrl.cpp
src/qt/uiaction.cpp
src/qt/utils.cpp
src/qt/window.cpp