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

@@ -0,0 +1,79 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/qt/textctrl.h
+// Author:      Mariano Reingart, Peter Most
+// Copyright:   (c) 2010 wxWidgets dev team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_QT_TEXTCTRL_H_
+#define _WX_QT_TEXTCTRL_H_
+
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QTextEdit>
+
+class WXDLLIMPEXP_CORE wxTextCtrl : public wxTextCtrlBase
+{
+public:
+    wxTextCtrl();
+    wxTextCtrl(wxWindow *parent,
+               wxWindowID id,
+               const wxString &value = wxEmptyString,
+               const wxPoint &pos = wxDefaultPosition,
+               const wxSize &size = wxDefaultSize,
+               long style = 0,
+               const wxValidator& validator = wxDefaultValidator,
+               const wxString &name = wxTextCtrlNameStr);
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString &value = wxEmptyString,
+                const wxPoint &pos = wxDefaultPosition,
+                const wxSize &size = wxDefaultSize,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString &name = wxTextCtrlNameStr);
+
+    virtual int GetLineLength(long lineNo) const;
+    virtual wxString GetLineText(long lineNo) const;
+    virtual int GetNumberOfLines() const;
+
+    virtual bool IsModified() const;
+    virtual void MarkDirty();
+    virtual void DiscardEdits();
+
+    virtual bool SetStyle(long start, long end, const wxTextAttr& style);
+    virtual bool GetStyle(long position, wxTextAttr& style);
+    virtual bool SetDefaultStyle(const wxTextAttr& style);
+    
+    virtual long XYToPosition(long x, long y) const;
+    virtual bool PositionToXY(long pos, long *x, long *y) const;
+
+    virtual void ShowPosition(long pos);
+
+    virtual void SetInsertionPoint(long pos);
+    virtual long GetInsertionPoint() const;
+    virtual void SetSelection( long from, long to );
+    virtual void GetSelection(long *from, long *to) const;
+
+    virtual wxString DoGetValue() const;
+    virtual void DoSetValue(const wxString &text, int flags = 0);
+    virtual void WriteText(const wxString& text);
+
+    virtual QWidget *GetHandle() const;
+
+protected:
+    virtual wxSize DoGetBestSize() const;
+
+    virtual bool DoLoadFile(const wxString& file, int fileType);
+    virtual bool DoSaveFile(const wxString& file, int fileType);
+
+    virtual QScrollArea *QtGetScrollBarsContainer() const;
+
+private:
+    QLineEdit *m_qtLineEdit;
+    QTextEdit *m_qtTextEdit;
+
+    wxDECLARE_DYNAMIC_CLASS( wxTextCtrl );
+};
+
+#endif // _WX_QT_TEXTCTRL_H_