If there is a sizer then use it's calculated minimum in wxStaticBox::DoGetBestSize

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

diff --git a/src/osx/dnd_osx.cpp b/src/osx/dnd_osx.cpp
index b64858930ae504373e76d4c1725f22bf9c2ecb6f..351d2b4007bedcf15cf91059b6d1edfad0666539 100644 (file)
--- a/src/osx/dnd_osx.cpp
+++ b/src/osx/dnd_osx.cpp
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: dnd.cpp 61724 2009-08-21 10:41:26Z VZ $
+// RCS-ID:      $Id$
 // Copyright:   (c) 1998 Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -36,7 +36,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 +79,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 +119,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 +164,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();