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

108
src/qt/textentry.cpp Normal file
View File

@@ -0,0 +1,108 @@
/////////////////////////////////////////////////////////////////////////////
// Name: src/qt/textentry.cpp
// Author: Peter Most
// Copyright: (c) Peter Most
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/textentry.h"
wxTextEntry::wxTextEntry()
{
}
void wxTextEntry::WriteText(const wxString& WXUNUSED(text))
{
}
void wxTextEntry::Remove(long WXUNUSED(from), long WXUNUSED(to))
{
}
void wxTextEntry::Copy()
{
}
void wxTextEntry::Cut()
{
}
void wxTextEntry::Paste()
{
}
void wxTextEntry::Undo()
{
}
void wxTextEntry::Redo()
{
}
bool wxTextEntry::CanUndo() const
{
return false;
}
bool wxTextEntry::CanRedo() const
{
return false;
}
void wxTextEntry::SetInsertionPoint(long WXUNUSED(pos))
{
}
long wxTextEntry::GetInsertionPoint() const
{
return 0;
}
long wxTextEntry::GetLastPosition() const
{
return 0;
}
void wxTextEntry::SetSelection(long WXUNUSED(from), long WXUNUSED(to))
{
wxFAIL_MSG("wxTextEntry::SetSelection should be overriden");
}
void wxTextEntry::GetSelection(long *from, long *to) const
{
// no unified get selection method in Qt (overriden in textctrl & combobox)
// only called if no selection
// If the return values from and to are the same, there is no
// selection.
{
*from =
*to = GetInsertionPoint();
}
}
bool wxTextEntry::IsEditable() const
{
return false;
}
void wxTextEntry::SetEditable(bool WXUNUSED(editable))
{
}
wxString wxTextEntry::DoGetValue() const
{
return wxString();
}
void wxTextEntry::DoSetValue(const wxString &WXUNUSED(value), int WXUNUSED(flags))
{
}
wxWindow *wxTextEntry::GetEditableWindow()
{
return NULL;
}