X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f3ac12aa7af09efb9314ecbec36c6832cfe6ae0c..24b9f055150de329d1fb61df5ce8d14e6d657cd0:/src/common/dobjcmn.cpp

diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp
index a71231b2ae..868b9c2a58 100644
--- a/src/common/dobjcmn.cpp
+++ b/src/common/dobjcmn.cpp
@@ -27,6 +27,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_DATAOBJ
+
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/debug.h"
@@ -47,7 +49,7 @@ WX_DEFINE_LIST(wxSimpleDataObjectList);
 // ----------------------------------------------------------------------------
 
 static wxDataFormat dataFormatInvalid;
-const wxDataFormat& wxFormatInvalid = dataFormatInvalid;
+WXDLLEXPORT const wxDataFormat& wxFormatInvalid = dataFormatInvalid;
 
 // ============================================================================
 // implementation
@@ -61,6 +63,33 @@ wxDataObjectBase::~wxDataObjectBase()
 {
 }
 
+bool wxDataObjectBase::IsSupported(const wxDataFormat& format,
+                                   Direction dir) const
+{
+    size_t nFormatCount = GetFormatCount(dir);
+    if ( nFormatCount == 1 )
+    {
+        return format == GetPreferredFormat(dir);
+    }
+    else
+    {
+        wxDataFormat *formats = new wxDataFormat[nFormatCount];
+        GetAllFormats(formats, dir);
+
+        size_t n;
+        for ( n = 0; n < nFormatCount; n++ )
+        {
+            if ( formats[n] == format )
+                break;
+        }
+
+        delete [] formats;
+
+        // found?
+        return n < nFormatCount;
+    }
+}
+
 // ----------------------------------------------------------------------------
 // wxDataObjectComposite
 // ----------------------------------------------------------------------------
@@ -255,7 +284,7 @@ void *wxCustomDataObject::Alloc(size_t size)
 
 void wxCustomDataObject::Free()
 {
-    delete [] m_data;
+    delete [] (char *)m_data;
     m_size = 0;
     m_data = (void *)NULL;
 }
@@ -337,5 +366,6 @@ wxDragResult wxFileDropTarget::OnData(wxCoord x, wxCoord y, wxDragResult def)
     return OnDropFiles(x, y, dobj->GetFilenames()) ? def : wxDragNone;
 }
 
-#endif
+#endif // wxUSE_DRAG_AND_DROP
 
+#endif // wxUSE_DATAOBJ