From ada083260a7c74b3bd084f6092a298e64a6c6b0f Mon Sep 17 00:00:00 2001 From: Kevin Ollivier Date: Sun, 8 Feb 2009 23:21:22 +0000 Subject: [PATCH] Stub out GetMatchingPair() for now to allow us to use the generic wxDVC on Cocoa. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/osx/dnd.h | 2 ++ src/osx/carbon/dnd.cpp | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/include/wx/osx/dnd.h b/include/wx/osx/dnd.h index dd91f63789..b956c42e32 100644 --- a/include/wx/osx/dnd.h +++ b/include/wx/osx/dnd.h @@ -55,6 +55,8 @@ class WXDLLIMPEXP_CORE wxDropTarget: public wxDropTargetBase virtual bool OnDrop(wxCoord x, wxCoord y); virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def); virtual bool GetData(); + // NOTE: This is needed by the generic wxDataViewCtrl, not sure how to implement. + virtual wxDataFormat GetMatchingPair(); bool CurrentDragHasSupportedFormat() ; void SetCurrentDragPasteboard( void* dragpasteboard ) { m_currentDragPasteboard = dragpasteboard ; } diff --git a/src/osx/carbon/dnd.cpp b/src/osx/carbon/dnd.cpp index 0d195b1502..bc0f7e5485 100644 --- a/src/osx/carbon/dnd.cpp +++ b/src/osx/carbon/dnd.cpp @@ -57,6 +57,12 @@ wxDragResult wxDropTarget::OnDragOver( return CurrentDragHasSupportedFormat() ? def : wxDragNone; } +wxDataFormat wxDropTarget::GetMatchingPair() +{ + wxFAIL_MSG("wxDropTarget::GetMatchingPair() not implemented in src/osx/carbon/dnd.cpp"); + return wxDF_INVALID; +} + bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) ) { if (m_dataObject == NULL) -- 2.45.2