X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bd77da975b1aeeb52c56d2aacb02beec039b5bc3..f783e7acf3800628d62d1ee0a97e41c58c870f0b:/src/common/dobjcmn.cpp

diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp
index de267315e2..d2d6a4e5b7 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
 // ----------------------------------------------------------------------------
@@ -97,17 +126,50 @@ wxDataObjectComposite::GetPreferredFormat(Direction WXUNUSED(dir)) const
 {
     wxSimpleDataObjectList::Node *node = m_dataObjects.Item( m_preferred );
 
-#ifdef __WXGTK__
-    wxCHECK_MSG( node, wxDataFormat(wxDF_INVALID), wxT("no preferred format") );
-#else
-    wxCHECK_MSG( node, wxDataFormat((unsigned short) wxDF_INVALID), wxT("no preferred format") );
-#endif
+    wxCHECK_MSG( node, wxFormatInvalid, wxT("no preferred format") );
 
     wxDataObjectSimple* dataObj = node->GetData();
 
     return dataObj->GetFormat();
 }
 
+#if defined(__WXMSW__)
+
+size_t wxDataObjectComposite::GetBufferOffset( const wxDataFormat& format )
+{
+    wxDataObjectSimple *dataObj = GetObject(format);
+
+    wxCHECK_MSG( dataObj, FALSE,
+                 wxT("unsupported format in wxDataObjectComposite"));
+
+    return dataObj->GetBufferOffset( format );
+}
+
+const void* wxDataObjectComposite::GetSizeFromBuffer( const void* buffer,
+                                                      size_t* size,
+                                                      const wxDataFormat& format )
+{
+    wxDataObjectSimple *dataObj = GetObject(format);
+
+    wxCHECK_MSG( dataObj, FALSE,
+                 wxT("unsupported format in wxDataObjectComposite"));
+
+    return dataObj->GetSizeFromBuffer( buffer, size, format );
+}
+
+void* wxDataObjectComposite::SetSizeInBuffer( void* buffer, size_t size,
+                                              const wxDataFormat& format )
+{
+    wxDataObjectSimple *dataObj = GetObject(format);
+
+    wxCHECK_MSG( dataObj, FALSE,
+                 wxT("unsupported format in wxDataObjectComposite"));
+
+    return dataObj->SetSizeInBuffer( buffer, size, format );
+}
+
+#endif
+
 size_t wxDataObjectComposite::GetFormatCount(Direction WXUNUSED(dir)) const
 {
     // TODO what about the Get/Set only formats?
@@ -165,19 +227,19 @@ bool wxDataObjectComposite::SetData(const wxDataFormat& format,
 
 size_t wxTextDataObject::GetDataSize() const
 {
-    return GetTextLength();
+    return GetTextLength() * sizeof(wxChar);
 }
 
 bool wxTextDataObject::GetDataHere(void *buf) const
 {
-    strcpy((char *)buf, GetText().mb_str());
+    wxStrcpy((wxChar *)buf, GetText().c_str());
 
     return TRUE;
 }
 
 bool wxTextDataObject::SetData(size_t WXUNUSED(len), const void *buf)
 {
-    SetText(wxString((const char *)buf));
+    SetText(wxString((const wxChar *)buf));
 
     return TRUE;
 }
@@ -233,6 +295,12 @@ void wxFileDataObjectBase::SetFilenames(const wxChar* filenames)
 // wxCustomDataObject
 // ----------------------------------------------------------------------------
 
+wxCustomDataObject::wxCustomDataObject(const wxDataFormat& format)
+    : wxDataObjectSimple(format)
+{
+    m_data = (void *)NULL;
+}
+
 wxCustomDataObject::~wxCustomDataObject()
 {
     Free();
@@ -253,7 +321,7 @@ void *wxCustomDataObject::Alloc(size_t size)
 
 void wxCustomDataObject::Free()
 {
-    delete [] m_data;
+    delete [] (char *)m_data;
     m_size = 0;
     m_data = (void *)NULL;
 }
@@ -287,3 +355,54 @@ bool wxCustomDataObject::SetData(size_t size, const void *buf)
     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 // wxUSE_DRAG_AND_DROP
+
+#endif // wxUSE_DATAOBJ