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

diff --git a/include/wx/osx/dnd.h b/include/wx/osx/dnd.h
index dd91f63789af72ea37177f20783c7421fc34b433..b956c42e325a9de54b202f305c21b4c50b8b9986 100644 (file)
--- 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 0d195b15024cde87c8fad246b7f13d5a5d8664e5..bc0f7e5485c6e1f408af1d0f6542a6cc2a565b34 100644 (file)
--- 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)