merged in the commit from the 2.2 branch

[wxWidgets.git] / src / common / dobjcmn.cpp

diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp
index 708d9e36ba9a35044d7513aabb6549daf46864f5..820989a6f48fe5fcd9b7467291c407a67b2cab69 100644 (file)
--- a/src/common/dobjcmn.cpp
+++ b/src/common/dobjcmn.cpp
@@ -47,7 +47,7 @@ WX_DEFINE_LIST(wxSimpleDataObjectList);
 // ----------------------------------------------------------------------------
 
 static wxDataFormat dataFormatInvalid;
 // ----------------------------------------------------------------------------
 
 static wxDataFormat dataFormatInvalid;

-const wxDataFormat& wxFormatInvalid = dataFormatInvalid;
+WXDLLEXPORT const wxDataFormat& wxFormatInvalid = dataFormatInvalid;

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -61,6 +61,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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxDataObjectComposite
 // ----------------------------------------------------------------------------


@@ -255,7 +282,7 @@ void *wxCustomDataObject::Alloc(size_t size)
 
 void wxCustomDataObject::Free()
 {
 
 void wxCustomDataObject::Free()
 {

-    delete [] m_data;
+    delete [] (char *)m_data;

     m_size = 0;
     m_data = (void *)NULL;
 }
     m_size = 0;
     m_data = (void *)NULL;
 }


@@ -301,9 +328,13 @@ bool wxCustomDataObject::SetData(size_t size, const void *buf)
 // wxTextDropTarget
 // ----------------------------------------------------------------------------
 
 // wxTextDropTarget
 // ----------------------------------------------------------------------------
 

+// NB: we can't use "new" in ctor initializer lists because this provokes an
+//     internal compiler error with VC++ 5.0 (hey, even gcc compiles this!),
+//     so use SetDataObject() instead
+

 wxTextDropTarget::wxTextDropTarget()
 wxTextDropTarget::wxTextDropTarget()

-                : wxDropTarget(new wxTextDataObject)

 {
 {

+    SetDataObject(new wxTextDataObject);

 }
 
 wxDragResult wxTextDropTarget::OnData(wxCoord x, wxCoord y, wxDragResult def)
 }
 
 wxDragResult wxTextDropTarget::OnData(wxCoord x, wxCoord y, wxDragResult def)


@@ -320,8 +351,8 @@ wxDragResult wxTextDropTarget::OnData(wxCoord x, wxCoord y, wxDragResult def)
 // ----------------------------------------------------------------------------
 
 wxFileDropTarget::wxFileDropTarget()
 // ----------------------------------------------------------------------------
 
 wxFileDropTarget::wxFileDropTarget()

-                : wxDropTarget(new wxFileDataObject)

 {
 {

+    SetDataObject(new wxFileDataObject);

 }
 
 wxDragResult wxFileDropTarget::OnData(wxCoord x, wxCoord y, wxDragResult def)
 }
 
 wxDragResult wxFileDropTarget::OnData(wxCoord x, wxCoord y, wxDragResult def)