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

See https://github.com/wxWidgets/wxWidgets/pull/1225
2019-06-29 19:21:07 +02:00
parent a4ba437aeb af5b122b2b
commit 44634cbf90
15 changed files with 1466 additions and 249 deletions
--- a/include/wx/qt/listctrl.h
+++ b/include/wx/qt/listctrl.h
@@ -10,7 +10,7 @@

 #include "wx/textctrl.h"

-class wxQtTreeWidget;
+class wxQtListTreeWidget;
 class QTreeWidgetItem;

 class WXDLLIMPEXP_FWD_CORE wxImageList;
@@ -282,7 +282,7 @@ protected:
                      m_ownsImageListSmall,
                      m_ownsImageListState;
 private:
-    wxQtTreeWidget *m_qtTreeWidget;
+    wxQtListTreeWidget *m_qtTreeWidget;

    wxDECLARE_DYNAMIC_CLASS( wxListCtrl );
 };