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

@@ -0,0 +1,47 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/clrpicker.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/clrpicker.h"
+
+wxColourPickerWidget::wxColourPickerWidget()
+{
+}
+
+wxColourPickerWidget::wxColourPickerWidget(wxWindow *parent,
+               wxWindowID id,
+               const wxColour& initial,
+               const wxPoint& pos,
+               const wxSize& size,
+               long style,
+               const wxValidator& validator,
+               const wxString& name )
+{
+    Create( parent, id, initial, pos, size, style, validator, name );
+}
+
+
+bool wxColourPickerWidget::Create(wxWindow *parent,
+            wxWindowID id,
+            const wxColour& initial,
+            const wxPoint& pos,
+            const wxSize& size,
+            long style,
+            const wxValidator& validator,
+            const wxString& name )
+{
+    return wxGenericColourButton::Create( parent, id, initial, pos, size, style, validator, name );
+}
+
+
+void wxColourPickerWidget::UpdateColour()
+{
+    wxGenericColourButton::UpdateColour();
+}
+