Merge wxQT branch into the trunk.

This merges in the latest sources from GSoC 2014 wxQt project with just a few
minor corrections, mostly undoing wrong changes to common files in that branch
(results of a previous bad merge?) and getting rid of whitespace-only changes.
Also remove debug logging from wxGrid.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/qt/spinctrl.h

@@ -0,0 +1,127 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/spinctrl.h
+// Author:      Peter Most, Mariano Reingart
+// Copyright:   (c) 2010 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_SPINCTRL_H_
+#define _WX_QT_SPINCTRL_H_
+
+#include <QtWidgets/QSpinBox>
+#include <QtWidgets/QDoubleSpinBox>
+
+// Take advantage of the Qt compile time polymorphy and use a template to avoid
+// copy&paste code for the usage of QSpinBox/QDoubleSpinBox.
+
+template < typename T, typename Widget >
+class WXDLLIMPEXP_CORE wxSpinCtrlQt : public wxSpinCtrlBase
+{
+public:
+    wxSpinCtrlQt();
+    wxSpinCtrlQt( wxWindow *parent, wxWindowID id, const wxString& value,
+        const wxPoint& pos, const wxSize& size, long style,
+        T min, T max, T initial, T inc,
+        const wxString& name );
+
+    bool Create( wxWindow *parent, wxWindowID id, const wxString& value,
+        const wxPoint& pos, const wxSize& size, long style,
+        T min, T max, T initial, T inc,
+        const wxString& name );
+
+    virtual void SetValue(const wxString&) {}
+
+    virtual void SetSnapToTicks(bool snap_to_ticks);
+    virtual bool GetSnapToTicks() const;
+
+    virtual void SetSelection(long from, long to);
+
+    virtual void SetValue(T val);
+    void SetRange(T minVal, T maxVal);
+    void SetIncrement(T inc);
+
+    T GetValue() const;
+    T GetMin() const;
+    T GetMax() const;
+    T GetIncrement() const;
+
+    virtual Widget *GetHandle() const;
+
+protected:
+    Widget *m_qtSpinBox;
+
+};
+
+class WXDLLIMPEXP_CORE wxSpinCtrl : public wxSpinCtrlQt< int, QSpinBox >
+{
+public:
+    wxSpinCtrl();
+    wxSpinCtrl(wxWindow *parent,
+               wxWindowID id = wxID_ANY,
+               const wxString& value = wxEmptyString,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
+               int min = 0, int max = 100, int initial = 0,
+               const wxString& name = wxT("wxSpinCtrl"));
+
+    bool Create(wxWindow *parent,
+                wxWindowID id = wxID_ANY,
+                const wxString& value = wxEmptyString,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
+                int min = 0, int max = 100, int initial = 0,
+                const wxString& name = wxT("wxSpinCtrl"));
+    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); }
+
+private:
+    // Common part of all ctors.
+    void Init()
+    {
+        m_base = 10;
+    }
+    int m_base;
+    DECLARE_DYNAMIC_CLASS( wxSpinCtrl )
+};
+
+class WXDLLIMPEXP_CORE wxSpinCtrlDouble : public wxSpinCtrlQt< double, QDoubleSpinBox >
+{
+public:
+    wxSpinCtrlDouble();
+    wxSpinCtrlDouble(wxWindow *parent,
+                     wxWindowID id = wxID_ANY,
+                     const wxString& value = wxEmptyString,
+                     const wxPoint& pos = wxDefaultPosition,
+                     const wxSize& size = wxDefaultSize,
+                     long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
+                     double min = 0, double max = 100, double initial = 0,
+                     double inc = 1,
+                     const wxString& name = wxT("wxSpinCtrlDouble"));
+
+    bool Create(wxWindow *parent,
+                wxWindowID id = wxID_ANY,
+                const wxString& value = wxEmptyString,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
+                double min = 0, double max = 100, double initial = 0,
+                double inc = 1,
+                const wxString& name = wxT("wxSpinCtrlDouble"));
+
+    void SetDigits(unsigned digits);
+    unsigned GetDigits() const;
+
+    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); }
+
+private:
+    wxDECLARE_DYNAMIC_CLASS( wxSpinCtrlDouble );
+};
+
+#endif // _WX_QT_SPINCTRL_H_