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/stattext.cpp

@@ -0,0 +1,67 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/stattext.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/stattext.h"
+#include "wx/qt/private/converter.h"
+#include "wx/qt/private/winevent.h"
+
+class wxQtStaticText : public wxQtEventSignalHandler< QLabel, wxStaticText >
+{
+public:
+    wxQtStaticText( wxWindow *parent, wxStaticText *handler ):
+        wxQtEventSignalHandler< QLabel, wxStaticText >( parent, handler ){}
+};
+
+
+wxStaticText::wxStaticText()
+{
+}
+
+wxStaticText::wxStaticText(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 wxStaticText::Create(wxWindow *parent,
+            wxWindowID id,
+            const wxString &label,
+            const wxPoint &pos,
+            const wxSize &size,
+            long style,
+            const wxString &name)
+{
+    m_qtLabel = new wxQtStaticText( parent, this );
+    m_qtLabel->setText( wxQtConvertString( label ) );
+
+    // Set the buddy to itself to get the mnemonic key but ensure that we don't have
+    // any unwanted side effects, so disable the interaction:
+
+    m_qtLabel->setBuddy( m_qtLabel );
+    m_qtLabel->setTextInteractionFlags( Qt::NoTextInteraction );
+    m_qtLabel->setWordWrap( true );
+
+    return QtCreateControl( parent, id, pos, size, style, wxDefaultValidator, name );
+}
+
+void wxStaticText::SetLabel(const wxString& label)
+{
+    m_qtLabel->setText( wxQtConvertString( label ) );
+}
+
+QLabel *wxStaticText::GetHandle() const
+{
+    return m_qtLabel;
+}