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:
60
src/qt/dnd.cpp
Normal file
60
src/qt/dnd.cpp
Normal file
@@ -0,0 +1,60 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: src/qt/dnd.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/dnd.h"
|
||||
|
||||
wxDropTarget::wxDropTarget(wxDataObject *WXUNUSED(dataObject))
|
||||
{
|
||||
}
|
||||
|
||||
bool wxDropTarget::OnDrop(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
wxDragResult wxDropTarget::OnData(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxDragResult WXUNUSED(def))
|
||||
{
|
||||
return wxDragResult();
|
||||
}
|
||||
|
||||
bool wxDropTarget::GetData()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
wxDataFormat wxDropTarget::GetMatchingPair()
|
||||
{
|
||||
wxFAIL_MSG("wxDropTarget::GetMatchingPair() not implemented in src/qt/dnd.cpp");
|
||||
return wxDF_INVALID;
|
||||
}
|
||||
|
||||
//##############################################################################
|
||||
|
||||
|
||||
wxDropSource::wxDropSource( wxWindow *WXUNUSED(win),
|
||||
const wxIcon &WXUNUSED(copy),
|
||||
const wxIcon &WXUNUSED(move),
|
||||
const wxIcon &WXUNUSED(none))
|
||||
{
|
||||
}
|
||||
|
||||
wxDropSource::wxDropSource( wxDataObject& WXUNUSED(data),
|
||||
wxWindow *WXUNUSED(win),
|
||||
const wxIcon &WXUNUSED(copy),
|
||||
const wxIcon &WXUNUSED(move),
|
||||
const wxIcon &WXUNUSED(none))
|
||||
{
|
||||
}
|
||||
|
||||
wxDragResult wxDropSource::DoDragDrop(int WXUNUSED(flags))
|
||||
{
|
||||
return wxDragResult();
|
||||
}
|
||||
|
Reference in New Issue
Block a user