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

@@ -0,0 +1,90 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/dialog.cpp
+// Author:      Peter Most, Javier Torres
+// Copyright:   (c) Peter Most, Javier Torres
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/dialog.h"
+#include "wx/qt/private/utils.h"
+#include "wx/qt/private/winevent.h"
+
+
+class wxQtDialog : public wxQtEventSignalHandler< QDialog, wxDialog >
+{
+
+    public:
+        wxQtDialog( wxWindow *parent, wxDialog *handler );
+};
+
+
+wxQtDialog::wxQtDialog( wxWindow *parent, wxDialog *handler )
+    : wxQtEventSignalHandler< QDialog, wxDialog >( parent, handler )
+{
+}
+
+wxDialog::wxDialog()
+{
+}
+
+wxDialog::wxDialog( wxWindow *parent, wxWindowID id,
+        const wxString &title,
+        const wxPoint &pos,
+        const wxSize &size,
+        long style,
+        const wxString &name)
+{
+    Create( parent, id, title, pos, size, style, name );
+}
+
+wxDialog::~wxDialog()
+{
+}
+
+
+bool wxDialog::Create( wxWindow *parent, wxWindowID id,
+        const wxString &title,
+        const wxPoint &pos,
+        const wxSize &size,
+        long style,
+        const wxString &name)
+{
+    SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);
+
+    // all dialogs should have tab traversal enabled
+    style |= wxTAB_TRAVERSAL;
+
+    m_qtWindow = new wxQtDialog( parent, this );
+    PostCreation();
+    return wxTopLevelWindow::Create( parent, id, title, pos, size, style, name );
+}
+
+int wxDialog::ShowModal()
+{
+    wxCHECK_MSG( GetHandle() != NULL, -1, "Invalid dialog" );
+    
+    return GetHandle()->exec() ? wxID_OK : wxID_CANCEL;
+}
+
+void wxDialog::EndModal(int retCode)
+{
+    wxCHECK_RET( GetHandle() != NULL, "Invalid dialog" );
+    
+    GetHandle()->done( retCode );
+}
+
+bool wxDialog::IsModal() const
+{
+    wxCHECK_MSG( GetHandle() != NULL, false, "Invalid dialog" );
+
+    return GetHandle()->isModal();
+}
+
+QDialog *wxDialog::GetHandle() const
+{
+    return static_cast<QDialog*>(m_qtWindow);
+}
+