X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5b208a1796ecf1b9ab267d200705b4f3b4d10e3..71a09c3579dd5cb4cd8fa7fdc143561cbff74e12:/src/osx/dnd_osx.cpp diff --git a/src/osx/dnd_osx.cpp b/src/osx/dnd_osx.cpp index 7fb1c922cc..ab6f153b53 100644 --- a/src/osx/dnd_osx.cpp +++ b/src/osx/dnd_osx.cpp @@ -4,7 +4,6 @@ // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id$ // Copyright: (c) 1998 Stefan Csomor // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -36,7 +35,7 @@ wxDragResult wxDropTarget::OnDragOver( wxDataFormat wxDropTarget::GetMatchingPair() { - wxFAIL_MSG("wxDropTarget::GetMatchingPair() not implemented in src/osx/carbon/dnd.cpp"); + wxFAIL_MSG("wxDropTarget::GetMatchingPair() not implemented in src/osx/dnd_osx.cpp"); return wxDF_INVALID; } @@ -79,7 +78,7 @@ bool wxDropTarget::CurrentDragHasSupportedFormat() for (size_t i = 0; !supported && i < formatcount; i++) { wxDataFormat format = array[i]; - if ( m_dataObject->IsSupported( format ) ) + if ( m_dataObject->IsSupported( format, wxDataObject::Set ) ) { supported = true; break; @@ -119,7 +118,7 @@ bool wxDropTarget::GetData() for (size_t i = 0; !transferred && i < formatcount; i++) { wxDataFormat format = array[i]; - if ( m_dataObject->IsSupported( format ) ) + if ( m_dataObject->IsSupported( format, wxDataObject::Set ) ) { int size = data->GetDataSize( format ); transferred = true; @@ -164,7 +163,7 @@ wxDropSource::~wxDropSource() bool wxDropSource::MacInstallDefaultCursor(wxDragResult effect) { const wxCursor& cursor = GetCursor(effect); - bool result = cursor.Ok(); + bool result = cursor.IsOk(); if ( result ) cursor.MacInstall();