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

@@ -0,0 +1,58 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/timer.cpp
+// Author:      Javier Torres
+// Copyright:   (c) Javier Torres
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_TIMER
+
+#include "wx/qt/timer.h"
+#include <QtCore/QTimerEvent>
+
+wxQtTimerImpl::wxQtTimerImpl( wxTimer* timer )
+    : wxTimerImpl( timer )
+{
+    m_timerId = -1;
+}
+
+bool wxQtTimerImpl::Start( int millisecs, bool oneShot )
+{
+    if ( !wxTimerImpl::Start( millisecs, oneShot ) )
+        return false;
+
+    if ( m_timerId >= 0 )
+        return false;
+
+    m_timerId = startTimer( GetInterval() );
+    
+    return m_timerId >= 0;
+}
+
+void wxQtTimerImpl::Stop()
+{
+    killTimer( m_timerId );
+    m_timerId = -1;
+}
+
+bool wxQtTimerImpl::IsRunning() const
+{
+    return m_timerId >= 0;
+}
+
+void wxQtTimerImpl::timerEvent( QTimerEvent * event )
+{
+    if ( event->timerId() == m_timerId )
+    {
+        if ( IsOneShot() )
+        {
+            Stop();
+        }
+        Notify();
+    }
+}
+
+#endif // wxUSE_TIMER