wiring OnInit on osx to a later point in event processing

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

diff --git a/src/osx/dnd_osx.cpp b/src/osx/dnd_osx.cpp
index 7fb1c922cc3051e9b040e049966a5384755e94ea..351d2b4007bedcf15cf91059b6d1edfad0666539 100644 (file)
--- a/src/osx/dnd_osx.cpp
+++ b/src/osx/dnd_osx.cpp
@@ -36,7 +36,7 @@ wxDragResult wxDropTarget::OnDragOver(
 
 wxDataFormat wxDropTarget::GetMatchingPair()
 {
 
 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;
 }
 
     return wxDF_INVALID;
 }
 


@@ -79,7 +79,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 +119,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 +164,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();