X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3f364be84b91d4e19729634ebf0b119145303a35..7b9da2077d0975db6c965a85c91d5aca671ab5e3:/src/common/dobjcmn.cpp

diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp
index f806dcdec6..a71231b2ae 100644
--- a/src/common/dobjcmn.cpp
+++ b/src/common/dobjcmn.cpp
@@ -42,6 +42,13 @@
 
 WX_DEFINE_LIST(wxSimpleDataObjectList);
 
+// ----------------------------------------------------------------------------
+// globals
+// ----------------------------------------------------------------------------
+
+static wxDataFormat dataFormatInvalid;
+const wxDataFormat& wxFormatInvalid = dataFormatInvalid;
+
 // ============================================================================
 // implementation
 // ============================================================================
@@ -90,7 +97,7 @@ wxDataObjectComposite::GetPreferredFormat(Direction WXUNUSED(dir)) const
 {
     wxSimpleDataObjectList::Node *node = m_dataObjects.Item( m_preferred );
 
-    wxCHECK_MSG( node, wxDF_INVALID, wxT("no preferred format") );
+    wxCHECK_MSG( node, wxFormatInvalid, wxT("no preferred format") );
 
     wxDataObjectSimple* dataObj = node->GetData();
 
@@ -175,6 +182,10 @@ bool wxTextDataObject::SetData(size_t WXUNUSED(len), const void *buf)
 // wxFileDataObjectBase
 // ----------------------------------------------------------------------------
 
+// VZ: I don't need this in MSW finally, so if it is needed in wxGTK, it should
+//     be moved to gtk/dataobj.cpp
+#if 0
+
 wxString wxFileDataObjectBase::GetFilenames() const
 {
     wxString str;
@@ -212,10 +223,18 @@ void wxFileDataObjectBase::SetFilenames(const wxChar* filenames)
     }
 }
 
+#endif // 0
+
 // ----------------------------------------------------------------------------
 // wxCustomDataObject
 // ----------------------------------------------------------------------------
 
+wxCustomDataObject::wxCustomDataObject(const wxDataFormat& format)
+    : wxDataObjectSimple(format)
+{
+    m_data = (void *)NULL;
+}
+
 wxCustomDataObject::~wxCustomDataObject()
 {
     Free();
@@ -257,7 +276,7 @@ bool wxCustomDataObject::GetDataHere(void *buf) const
     return TRUE;
 }
 
-bool wxCustomDataObject::SetData(size_t len, const void *buf)
+bool wxCustomDataObject::SetData(size_t size, const void *buf)
 {
     Free();
 
@@ -265,8 +284,58 @@ bool wxCustomDataObject::SetData(size_t len, const void *buf)
     if ( !m_data )
         return FALSE;
 
-    memcpy(m_data, buf, m_size = len);
+    memcpy(m_data, buf, m_size = size);
 
     return TRUE;
 }
 
+// ============================================================================
+// some common dnd related code
+// ============================================================================
+
+#if wxUSE_DRAG_AND_DROP
+
+#include "wx/dnd.h"
+
+// ----------------------------------------------------------------------------
+// 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()
+{
+    SetDataObject(new wxTextDataObject);
+}
+
+wxDragResult wxTextDropTarget::OnData(wxCoord x, wxCoord y, wxDragResult def)
+{
+    if ( !GetData() )
+        return wxDragNone;
+
+    wxTextDataObject *dobj = (wxTextDataObject *)m_dataObject;
+    return OnDropText(x, y, dobj->GetText()) ? def : wxDragNone;
+}
+
+// ----------------------------------------------------------------------------
+// wxFileDropTarget
+// ----------------------------------------------------------------------------
+
+wxFileDropTarget::wxFileDropTarget()
+{
+    SetDataObject(new wxFileDataObject);
+}
+
+wxDragResult wxFileDropTarget::OnData(wxCoord x, wxCoord y, wxDragResult def)
+{
+    if ( !GetData() )
+        return wxDragNone;
+
+    wxFileDataObject *dobj = (wxFileDataObject *)m_dataObject;
+    return OnDropFiles(x, y, dobj->GetFilenames()) ? def : wxDragNone;
+}
+
+#endif
+