Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stub out GetMatchingPair() for now to allow us to use the generic wxDVC on Cocoa.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2009-02-08 23:21:22 +00:00
parent 6e23949a98
commit ada083260a
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/osx/dnd.h
View File

@@ -55,6 +55,8 @@ class WXDLLIMPEXP_CORE wxDropTarget: public wxDropTargetBase
virtual bool OnDrop(wxCoord x, wxCoord y); virtual bool OnDrop(wxCoord x, wxCoord y);
virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def); virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
virtual bool GetData(); virtual bool GetData();
// NOTE: This is needed by the generic wxDataViewCtrl, not sure how to implement.
virtual wxDataFormat GetMatchingPair();
bool CurrentDragHasSupportedFormat() ; bool CurrentDragHasSupportedFormat() ;
void SetCurrentDragPasteboard( void* dragpasteboard ) { m_currentDragPasteboard = dragpasteboard ; } void SetCurrentDragPasteboard( void* dragpasteboard ) { m_currentDragPasteboard = dragpasteboard ; }

6
src/osx/carbon/dnd.cpp
View File

@@ -57,6 +57,12 @@ wxDragResult wxDropTarget::OnDragOver(
return CurrentDragHasSupportedFormat() ? def : wxDragNone; 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) ) bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) )
{ {
if (m_dataObject == NULL) if (m_dataObject == NULL)