fix building with WXWIN_COMPATIBILITY_2_8 == 0

[wxWidgets.git] / src / osx / dnd_osx.cpp

diff --git a/src/osx/dnd_osx.cpp b/src/osx/dnd_osx.cpp
index fc2e684f2d0761338108b36ad3957b9597d87f05..ab6f153b5349cb1f44b5a214378f80db9874a380 100644 (file)
--- 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
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01

-// RCS-ID:      $Id$

 // Copyright:   (c) 1998 Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -79,7 +78,7 @@ bool wxDropTarget::CurrentDragHasSupportedFormat()
             for (size_t i = 0; !supported && i < formatcount; i++)
             {
                 wxDataFormat format = array[i];
             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;
                 {
                     supported = true;
                     break;


@@ -119,7 +118,7 @@ bool wxDropTarget::GetData()
             for (size_t i = 0; !transferred && i < formatcount; i++)
             {
                 wxDataFormat format = array[i];
             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;
                 {
                     int size = data->GetDataSize( format );
                     transferred = true;


@@ -164,7 +163,7 @@ wxDropSource::~wxDropSource()
 bool wxDropSource::MacInstallDefaultCursor(wxDragResult effect)
 {
     const wxCursor& cursor = GetCursor(effect);
 bool wxDropSource::MacInstallDefaultCursor(wxDragResult effect)
 {
     const wxCursor& cursor = GetCursor(effect);

-    bool result = cursor.Ok();
+    bool result = cursor.IsOk();

 
     if ( result )
         cursor.MacInstall();
 
     if ( result )
         cursor.MacInstall();