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

@@ -0,0 +1,321 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/qt/dataview.cpp
+// Author:      Peter Most
+// Copyright:   (c) Peter Most
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_DATAVIEWCTRL
+
+#include "wx/dataview.h"
+
+#ifndef wxUSE_GENERICDATAVIEWCTRL
+
+wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *renderer,
+                  unsigned int model_column, int width,
+                  wxAlignment align,
+                  int flags )
+    : wxDataViewColumnBase( renderer, model_column )
+{
+}
+
+wxDataViewColumn::wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *renderer,
+                  unsigned int model_column, int width,
+                  wxAlignment align,
+                  int flags )
+    : wxDataViewColumnBase( bitmap, renderer, model_column )
+{
+}
+
+void wxDataViewColumn::SetTitle( const wxString &title )
+{
+}
+
+void wxDataViewColumn::SetBitmap( const wxBitmap &bitmap )
+{
+}
+
+void wxDataViewColumn::SetOwner( wxDataViewCtrl *owner )
+{
+}
+
+void wxDataViewColumn::SetAlignment( wxAlignment align )
+{
+}
+
+void wxDataViewColumn::SetSortable( bool sortable )
+{
+}
+
+void wxDataViewColumn::SetSortOrder( bool ascending )
+{
+}
+
+void wxDataViewColumn::SetAsSortKey(bool sort)
+{
+}
+
+void wxDataViewColumn::SetResizeable( bool resizeable )
+{
+}
+
+void wxDataViewColumn::SetHidden( bool hidden )
+{
+}
+
+void wxDataViewColumn::SetMinWidth( int minWidth )
+{
+}
+
+void wxDataViewColumn::SetWidth( int width )
+{
+}
+
+void wxDataViewColumn::SetReorderable( bool reorderable )
+{
+}
+
+void wxDataViewColumn::SetFlags(int flags)
+{
+}
+
+wxString wxDataViewColumn::GetTitle() const
+{
+    return wxString();
+}
+
+wxAlignment wxDataViewColumn::GetAlignment() const
+{
+    return wxAlignment();
+}
+
+bool wxDataViewColumn::IsSortable() const
+{
+    return false;
+}
+
+bool wxDataViewColumn::IsSortOrderAscending() const
+{
+    return false;
+}
+
+bool wxDataViewColumn::IsSortKey() const
+{
+    return false;
+}
+
+bool wxDataViewColumn::IsResizeable() const
+{
+    return false;
+}
+
+bool wxDataViewColumn::IsHidden() const
+{
+    return false;
+}
+
+int wxDataViewColumn::GetWidth() const
+{
+    return 0;
+}
+
+int wxDataViewColumn::GetMinWidth() const
+{
+    return 0;
+}
+
+bool wxDataViewColumn::IsReorderable() const
+{
+    return false;
+}
+
+int wxDataViewColumn::GetFlags() const
+{
+    return 0;
+}
+
+//##############################################################################
+
+
+wxDataViewCtrl::wxDataViewCtrl()
+{
+}
+
+wxDataViewCtrl::wxDataViewCtrl( wxWindow *parent, wxWindowID id,
+       const wxPoint& pos,
+       const wxSize& size, long style,
+       const wxValidator& validator)
+{
+}
+
+wxDataViewCtrl::~wxDataViewCtrl()
+{
+}
+
+
+
+bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
+       const wxPoint& pos,
+       const wxSize& size, long style,
+       const wxValidator& validator)
+{
+    return false;
+}
+
+bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
+{
+    return false;
+}
+
+bool wxDataViewCtrl::PrependColumn( wxDataViewColumn *col )
+{
+    return false;
+}
+
+bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col )
+{
+    return false;
+}
+
+bool wxDataViewCtrl::InsertColumn( unsigned int pos, wxDataViewColumn *col )
+{
+    return false;
+}
+
+unsigned wxDataViewCtrl::GetColumnCount() const
+{
+    return 0;
+}
+
+wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const
+{
+    return NULL;
+}
+
+bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column )
+{
+    return false;
+}
+
+bool wxDataViewCtrl::ClearColumns()
+{
+    return false;
+}
+
+int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
+{
+    return 0;
+}
+
+wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const
+{
+    return NULL;
+}
+
+wxDataViewItem wxDataViewCtrl::GetSelection() const
+{
+    return wxDataViewItem();
+}
+
+int wxDataViewCtrl::GetSelections( wxDataViewItemArray & sel ) const
+{
+    return 0;
+}
+
+void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel )
+{
+}
+
+void wxDataViewCtrl::Select( const wxDataViewItem & item )
+{
+}
+
+void wxDataViewCtrl::Unselect( const wxDataViewItem & item )
+{
+}
+
+bool wxDataViewCtrl::IsSelected( const wxDataViewItem & item ) const
+{
+    return false;
+}
+
+void wxDataViewCtrl::SelectAll()
+{
+}
+
+void wxDataViewCtrl::UnselectAll()
+{
+}
+
+void wxDataViewCtrl::EnsureVisible( const wxDataViewItem& item,
+                            const wxDataViewColumn *column)
+{
+}
+
+void wxDataViewCtrl::HitTest( const wxPoint &point,
+                      wxDataViewItem &item,
+                      wxDataViewColumn *&column ) const
+{
+}
+
+wxRect wxDataViewCtrl::GetItemRect( const wxDataViewItem &item,
+                            const wxDataViewColumn *column) const
+{
+    return wxRect();
+}
+
+void wxDataViewCtrl::Expand( const wxDataViewItem & item )
+{
+}
+
+void wxDataViewCtrl::Collapse( const wxDataViewItem & item )
+{
+}
+
+bool wxDataViewCtrl::IsExpanded( const wxDataViewItem & item ) const
+{
+    return false;
+}
+
+bool wxDataViewCtrl::EnableDragSource( const wxDataFormat &format )
+{
+    return false;
+}
+
+bool wxDataViewCtrl::EnableDropTarget( const wxDataFormat &format )
+{
+    return false;
+}
+
+wxVisualAttributes wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
+{
+    return wxVisualAttributes();
+}
+
+void wxDataViewCtrl::OnInternalIdle()
+{
+}
+
+void wxDataViewCtrl::DoSetExpanderColumn()
+{
+}
+
+void wxDataViewCtrl::DoSetIndent()
+{
+}
+
+wxDataViewItem wxDataViewCtrl::DoGetCurrentItem() const
+{
+    return wxDataViewItem();
+}
+
+void wxDataViewCtrl::DoSetCurrentItem(const wxDataViewItem& item)
+{
+}
+
+#endif // !wxUSE_GENERICDATAVIEWCTRL
+
+#endif // wxUSE_DATAVIEWCTRL