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/samples/treectrl/treetest.cpp
+++ b/samples/treectrl/treetest.cpp
@@ -1055,7 +1055,7 @@ void MyTreeCtrl::CreateStateImageList(bool del)
    AssignStateImageList(states);
 }

-#if USE_GENERIC_TREECTRL || !defined(__WXMSW__)
+#if USE_GENERIC_TREECTRL || (!defined(__WXMSW__) && !defined(__WXQT__))
 void MyTreeCtrl::CreateButtonsImageList(int size)
 {
    if ( size == -1 )