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

@@ -0,0 +1,46 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        cursor.h
+// Author:      Sean D'Epagnier
+// Copyright:   (c) Sean D'Epagnier 2014
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_CURSOR_H_
+#define _WX_QT_CURSOR_H_
+
+#include "wx/gdicmn.h"
+#include "wx/gdiobj.h"
+#include "wx/image.h"
+
+#include <QtGui/QCursor>
+
+class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject
+{
+public:
+    wxCursor() { }
+    wxCursor( const wxCursor & );
+    wxCursor( const wxImage& image ) { InitFromImage(image); }
+    wxCursor( const wxString& name,
+              wxBitmapType type = wxCURSOR_DEFAULT_TYPE,
+              int hotSpotX = 0, int hotSpotY = 0 );
+    wxCursor(wxStockCursor id) { InitFromStock(id); }
+#if WXWIN_COMPATIBILITY_2_8
+    wxCursor(int id) { InitFromStock((wxStockCursor)id); }
+#endif
+
+    QCursor m_qtCursor;
+
+protected:
+    void InitFromStock( wxStockCursor cursorId );
+#if wxUSE_IMAGE
+    void InitFromImage( const wxImage & image );
+#endif
+
+protected:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+    
+    DECLARE_DYNAMIC_CLASS( wxCursor )
+};
+
+#endif // _WX_QT_CURSOR_H_