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

src/qt/statbox.cpp

@@ -0,0 +1,64 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/statbox.cpp
+// Author:      Peter Most, Mariano Reingart
+// Copyright:   (c) 2010 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/statbox.h"
+#include "wx/window.h"
+#include "wx/qt/private/converter.h"
+#include "wx/qt/private/winevent.h"
+#include <QtWidgets/QGroupBox>
+
+
+class wxQtGroupBox : public wxQtEventSignalHandler< QGroupBox, wxStaticBox >
+{
+public:
+    wxQtGroupBox( wxWindow *parent, wxStaticBox *handler ):
+        wxQtEventSignalHandler< QGroupBox, wxStaticBox >( parent, handler ){}
+};
+
+
+wxStaticBox::wxStaticBox()
+{
+}
+
+wxStaticBox::wxStaticBox(wxWindow *parent, wxWindowID id,
+            const wxString& label,
+            const wxPoint& pos,
+            const wxSize& size,
+            long style,
+            const wxString& name)
+{
+    Create( parent, id, label, pos, size, style, name );
+}
+
+bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
+            const wxString& label,
+            const wxPoint& pos,
+            const wxSize& size,
+            long style,
+            const wxString& name)
+{
+    m_qtGroupBox = new wxQtGroupBox( parent, this );
+    m_qtGroupBox->setTitle( wxQtConvertString( label ) );
+
+    return QtCreateControl( parent, id, pos, size, style, wxDefaultValidator, name );
+}
+
+QGroupBox *wxStaticBox::GetHandle() const
+{
+    return m_qtGroupBox;
+}
+
+void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
+{
+    wxStaticBoxBase::GetBordersForSizer(borderTop, borderOther);
+
+    // need extra space for the label:
+    *borderTop += GetCharHeight();
+}