From d639e4ffcea163fedbce687dd2a96ceb42f0d450 Mon Sep 17 00:00:00 2001
From: Graham Dawes <graham.dawes@geoteric.com>
Date: Tue, 29 Nov 2016 15:48:07 +0000
Subject: [PATCH] Fix wxQt build errors when using gcc 4.4

Closes #17733.
---
 include/wx/qt/spinctrl.h | 4 ++--
 src/generic/graphicc.cpp | 1 +
 src/qt/colordlg.cpp      | 2 +-
 src/qt/filedlg.cpp       | 2 +-
 src/qt/fontdlg.cpp       | 2 +-
 src/qt/glcanvas.cpp      | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/include/wx/qt/spinctrl.h b/include/wx/qt/spinctrl.h
index 6d016eb101..756272b29a 100644
--- a/include/wx/qt/spinctrl.h
+++ b/include/wx/qt/spinctrl.h
@@ -76,7 +76,7 @@ public:
     virtual int GetBase() const wxOVERRIDE { return m_base; }
     virtual bool SetBase(int base) wxOVERRIDE;
     virtual void SetValue(const wxString & val);
-    virtual void SetValue(int val) { wxSpinCtrlQt::SetValue(val); }
+    virtual void SetValue(int val) { wxSpinCtrlQt<int,QSpinBox>::SetValue(val); }
 
 private:
     // Common part of all ctors.
@@ -118,7 +118,7 @@ public:
     virtual int GetBase() const wxOVERRIDE { return 10; }
     virtual bool SetBase(int WXUNUSED(base)) wxOVERRIDE { return false; }
     virtual void SetValue(const wxString & val);
-    virtual void SetValue(double val) { wxSpinCtrlQt::SetValue(val); }
+    virtual void SetValue(double val) { wxSpinCtrlQt<double,QDoubleSpinBox>::SetValue(val); }
 
 private:
     wxDECLARE_DYNAMIC_CLASS( wxSpinCtrlDouble );
diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp
index 0369cbb452..6441acb581 100644
--- a/src/generic/graphicc.cpp
+++ b/src/generic/graphicc.cpp
@@ -25,6 +25,7 @@
 #define cairo_public 
 
 #include <cairo.h>
+#include <float.h>
 
 bool wxCairoInit();
 
diff --git a/src/qt/colordlg.cpp b/src/qt/colordlg.cpp
index 3e4dda17a2..7a34b1cca3 100644
--- a/src/qt/colordlg.cpp
+++ b/src/qt/colordlg.cpp
@@ -15,7 +15,7 @@ class wxQtColorDialog : public wxQtEventSignalHandler< QColorDialog, wxDialog >
 {
 public:
     wxQtColorDialog( wxWindow *parent, wxDialog *handler)
-        : wxQtEventSignalHandler(parent, handler)
+        : wxQtEventSignalHandler<QColorDialog,wxDialog>(parent, handler)
         { }
 };
 
diff --git a/src/qt/filedlg.cpp b/src/qt/filedlg.cpp
index d3161303af..d721e66e36 100644
--- a/src/qt/filedlg.cpp
+++ b/src/qt/filedlg.cpp
@@ -23,7 +23,7 @@ public:
     wxQtFileDialog( wxWindow *parent, wxDialog *handler,
                     const wxString& message, const wxString& defaultDir,
                     const wxString& defaultFile, const wxString& wildCard, long style )
-        : wxQtEventSignalHandler(parent, handler)
+        : wxQtEventSignalHandler<QFileDialog,wxDialog>(parent, handler)
     {
         setLabelText(QFileDialog::LookIn, wxQtConvertString(message));
         setDirectory(wxQtConvertString(defaultDir));
diff --git a/src/qt/fontdlg.cpp b/src/qt/fontdlg.cpp
index fa5a0fcfd4..679cbebde5 100644
--- a/src/qt/fontdlg.cpp
+++ b/src/qt/fontdlg.cpp
@@ -15,7 +15,7 @@ class wxQtFontDialog : public wxQtEventSignalHandler< QFontDialog, wxFontDialog
 {
 public:
     wxQtFontDialog( wxWindow *parent, wxFontDialog *handler)
-        : wxQtEventSignalHandler(parent, handler)
+        : wxQtEventSignalHandler<QFontDialog,wxFontDialog>(parent, handler)
         {
             connect(this, &QFontDialog::currentFontChanged, this, &wxQtFontDialog::updateFont);
         }
diff --git a/src/qt/glcanvas.cpp b/src/qt/glcanvas.cpp
index 1bb3feb331..319521a82a 100644
--- a/src/qt/glcanvas.cpp
+++ b/src/qt/glcanvas.cpp
@@ -16,7 +16,7 @@ class wxQtGLWidget : public wxQtEventSignalHandler< QGLWidget, wxGLCanvas >
 {
 public:
     wxQtGLWidget(wxWindow *parent, wxGLCanvas *handler, QGLFormat format)
-        : wxQtEventSignalHandler(parent, handler)
+        : wxQtEventSignalHandler<QGLWidget,wxGLCanvas>(parent, handler)
         {
             setFormat(format);
             setAutoBufferSwap( false );