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
This commit is contained in:
Vadim Zeitlin
2014-08-24 01:50:11 +00:00
parent d513d3e2f0
commit df13791078
381 changed files with 24333 additions and 938 deletions

53
src/qt/dvrenderer.cpp Normal file
View File

@@ -0,0 +1,53 @@
/////////////////////////////////////////////////////////////////////////////
// Name: src/qt/dvrenderer.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
wxDataViewRenderer::wxDataViewRenderer( const wxString &variantType,
wxDataViewCellMode mode,
int align)
: wxDataViewRendererBase( variantType, mode, align )
{
}
void wxDataViewRenderer::SetMode( wxDataViewCellMode mode )
{
}
wxDataViewCellMode wxDataViewRenderer::GetMode() const
{
return wxDataViewCellMode();
}
void wxDataViewRenderer::SetAlignment( int align )
{
}
int wxDataViewRenderer::GetAlignment() const
{
return 0;
}
void wxDataViewRenderer::EnableEllipsize(wxEllipsizeMode mode)
{
}
wxEllipsizeMode wxDataViewRenderer::GetEllipsizeMode() const
{
return wxEllipsizeMode();
}
#endif // !wxUSE_GENERICDATAVIEWCTRL
#endif // wxUSE_DATAVIEWCTRL