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

@@ -0,0 +1,46 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/dialog.h
+// Author:      Peter Most, Javier Torres
+// Copyright:   (c) Peter Most, Javier Torres
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_DIALOG_H_
+#define _WX_QT_DIALOG_H_
+
+#include "wx/dialog.h"
+#include <QtWidgets/QDialog>
+
+class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase
+{
+public:
+    wxDialog();
+    wxDialog( wxWindow *parent, wxWindowID id,
+            const wxString &title,
+            const wxPoint &pos = wxDefaultPosition,
+            const wxSize &size = wxDefaultSize,
+            long style = wxDEFAULT_DIALOG_STYLE,
+            const wxString &name = wxDialogNameStr );
+
+    virtual ~wxDialog();
+    
+    bool Create( wxWindow *parent, wxWindowID id,
+            const wxString &title,
+            const wxPoint &pos = wxDefaultPosition,
+            const wxSize &size = wxDefaultSize,
+            long style = wxDEFAULT_DIALOG_STYLE,
+            const wxString &name = wxDialogNameStr );
+
+    virtual int ShowModal();
+    virtual void EndModal(int retCode);
+    virtual bool IsModal() const;
+
+    virtual QDialog *GetHandle() const;
+
+private:
+
+    wxDECLARE_DYNAMIC_CLASS( wxDialog );
+};
+
+
+#endif // _WX_QT_DIALOG_H_