From 64826649559938ba10cd67c9841b5a97f0b1f121 Mon Sep 17 00:00:00 2001
From: Graham Dawes <graham.dawes@geoteric.com>
Date: Fri, 8 Feb 2019 14:43:04 +0000
Subject: [PATCH] Fix build errors when building with gcc

---
 include/wx/qt/private/converter.h | 1 +
 src/qt/treectrl.cpp               | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/include/wx/qt/private/converter.h b/include/wx/qt/private/converter.h
index c00149a47d..fbb4250bd6 100644
--- a/include/wx/qt/private/converter.h
+++ b/include/wx/qt/private/converter.h
@@ -15,6 +15,7 @@
 
 #include "wx/kbdstate.h"
 #include "wx/gdicmn.h"
+#include "wx/colour.h"
 
 #include <QtCore/QRect>
 #include <QtCore/QSize>
diff --git a/src/qt/treectrl.cpp b/src/qt/treectrl.cpp
index 59ed55fbca..b7bca683a6 100644
--- a/src/qt/treectrl.cpp
+++ b/src/qt/treectrl.cpp
@@ -14,6 +14,7 @@
 
 #include "wx/treectrl.h"
 #include "wx/imaglist.h"
+#include "wx/settings.h"
 
 #include "wx/qt/private/winevent.h"
 #include "wx/qt/private/treeitemfactory.h"
@@ -46,7 +47,6 @@ struct TreeItemDataQt
 };
 
 bool TreeItemDataQt::registered = false;
-Q_DECLARE_METATYPE(TreeItemDataQt)
 
 QDataStream &operator<<(QDataStream &out, const TreeItemDataQt &WXUNUSED(obj))
 {
@@ -119,11 +119,13 @@ private:
 
 }
 
+Q_DECLARE_METATYPE(TreeItemDataQt)
+
 class wxQTreeWidget : public wxQtEventSignalHandler<QTreeWidget, wxTreeCtrl>
 {
 public:
     wxQTreeWidget(wxWindow *parent, wxTreeCtrl *handler) :
-        wxQtEventSignalHandler(parent, handler),
+        wxQtEventSignalHandler<QTreeWidget, wxTreeCtrl>(parent, handler),
         m_editorFactory(handler)
     {
         connect(this, &QTreeWidget::currentItemChanged,
@@ -796,7 +798,7 @@ wxTreeItemId wxTreeCtrl::GetNextChild(
 {
     wxCHECK_MSG(item.IsOk(), wxTreeItemId(), "invalid tree item");
 
-    int currentIndex = reinterpret_cast<int>(cookie);
+    wxIntPtr currentIndex = reinterpret_cast<wxIntPtr>(cookie);
     ++currentIndex;
 
     const QTreeWidgetItem *qTreeItem = wxQtConvertTreeItem(item);