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/msgdlg.h

@@ -0,0 +1,33 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/msgdlg.h
+// Author:      Peter Most, Javier Torres
+// Copyright:   (c) Peter Most, Javier Torres
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_MSGDLG_H_
+#define _WX_QT_MSGDLG_H_
+
+#include "wx/msgdlg.h"
+
+#include <QtWidgets/QMessageBox>
+
+class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogBase
+{
+public:
+    wxMessageDialog(wxWindow *parent, const wxString& message,
+                    const wxString& caption = wxMessageBoxCaptionStr,
+                    long style = wxOK|wxCENTRE,
+                    const wxPoint& pos = wxDefaultPosition);
+    virtual ~wxMessageDialog();
+
+    // Reimplemented to translate return codes from Qt to wx
+    virtual int ShowModal();
+    
+    virtual QMessageBox *GetHandle() const;
+
+private:
+    QMessageBox *m_qtMessageBox;
+};
+
+#endif // _WX_QT_MSGDLG_H_