Fix deprecating warning introduced in r72446.

[wxWidgets.git] / src / gtk / dataobj.cpp

diff --git a/src/gtk/dataobj.cpp b/src/gtk/dataobj.cpp
index 3af8442a63c67f1d0e1ea69cd7ff20fd6b9ea465..db02431737fc45942e80cc4a0504bbb806cd882d 100644 (file)
--- a/src/gtk/dataobj.cpp
+++ b/src/gtk/dataobj.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        dataobj.cpp
+// Name:        src/gtk/dataobj.cpp

 // Purpose:     wxDataObject class
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:     wxDataObject class
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,38 +7,50 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-    #pragma implementation "dataobj.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_DATAOBJ

 
 #include "wx/dataobj.h"
 
 #include "wx/dataobj.h"

-#include "wx/app.h"
-#include "wx/debug.h"
-#include "wx/mstream.h"
-#include "wx/image.h"

 
 

-#include "gdk/gdk.h"
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/image.h"
+#endif

 
 

+#include "wx/mstream.h"
+#include "wx/uri.h"
+
+#include "wx/gtk/private.h"

 
 //-------------------------------------------------------------------------
 // global data
 //-------------------------------------------------------------------------
 
 GdkAtom  g_textAtom        = 0;
 
 //-------------------------------------------------------------------------
 // global data
 //-------------------------------------------------------------------------
 
 GdkAtom  g_textAtom        = 0;

+GdkAtom  g_altTextAtom     = 0;

 GdkAtom  g_pngAtom         = 0;
 GdkAtom  g_pngAtom         = 0;

+GdkAtom  g_fileAtom        = 0;
+GdkAtom  g_htmlAtom        = 0;

 
 //-------------------------------------------------------------------------
 // wxDataFormat
 //-------------------------------------------------------------------------
 
 
 //-------------------------------------------------------------------------
 // wxDataFormat
 //-------------------------------------------------------------------------
 

-IMPLEMENT_CLASS(wxDataFormat, wxObject)
-

 wxDataFormat::wxDataFormat()
 {
 wxDataFormat::wxDataFormat()
 {

-    PrepareFormats();
+    // do *not* call PrepareFormats() from here for 2 reasons:
+    //
+    // 1. we will have time to do it later because some other Set function
+    //    must be called before we really need them
+    //
+    // 2. doing so prevents us from declaring global wxDataFormats because
+    //    calling PrepareFormats (and thus gdk_atom_intern) before GDK is
+    //    initialised will result in a crash

     m_type = wxDF_INVALID;
     m_type = wxDF_INVALID;

-    m_hasAtom = FALSE;
-    m_atom = (GdkAtom) 0;
+    m_format = (GdkAtom) 0;

 }
 
 wxDataFormat::wxDataFormat( wxDataFormatId type )
 }
 
 wxDataFormat::wxDataFormat( wxDataFormatId type )


@@ -47,77 +59,49 @@ wxDataFormat::wxDataFormat( wxDataFormatId type )
     SetType( type );
 }
 
     SetType( type );
 }
 

-wxDataFormat::wxDataFormat( const wxChar *id )
+void wxDataFormat::InitFromString( const wxString &id )

 {
     PrepareFormats();
     SetId( id );
 }
 
 {
     PrepareFormats();
     SetId( id );
 }
 

-wxDataFormat::wxDataFormat( const wxString &id )
+wxDataFormat::wxDataFormat( NativeFormat format )

 {
     PrepareFormats();
 {
     PrepareFormats();

-    SetId( id );
+    SetId( format );

 }
 
 }
 

-wxDataFormat::wxDataFormat( const wxDataFormat &format )
-{
-    PrepareFormats();
-    m_type = format.GetType();
-    m_id = format.GetId();
-    m_hasAtom = TRUE;
-    m_atom = ((wxDataFormat &)format).GetAtom();    // const_cast
-}
-
-wxDataFormat::wxDataFormat( const GdkAtom atom )
+void wxDataFormat::SetType( wxDataFormatId type )

 {
     PrepareFormats();
 {
     PrepareFormats();

-    m_hasAtom = TRUE;

 
 

-    m_atom = atom;
-
-    if (m_atom == g_textAtom)
-    {
-        m_type = wxDF_TEXT;
-    } else
-    if (m_atom == GDK_TARGET_BITMAP)
-    {
-        m_type = wxDF_BITMAP;
-    } else
-    {
-        m_type = wxDF_PRIVATE;
-       m_id = gdk_atom_name( m_atom );
-
-       if (m_id == _T("file:ALL"))
-       {
-           m_type = wxDF_FILENAME;
-       }
-    }
-}
-
-void wxDataFormat::SetType( wxDataFormatId type )
-{

     m_type = type;
 
     m_type = type;
 

+#if wxUSE_UNICODE
+    if (m_type == wxDF_UNICODETEXT)
+        m_format = g_textAtom;
+    else if (m_type == wxDF_TEXT)
+        m_format = g_altTextAtom;
+#else // !wxUSE_UNICODE
+    // notice that we don't map wxDF_UNICODETEXT to g_textAtom here, this
+    // would lead the code elsewhere to treat data objects with this format as
+    // containing UTF-8 data which is not true

     if (m_type == wxDF_TEXT)
     if (m_type == wxDF_TEXT)

-    {
-        m_id = _T("STRING");
-    }
+        m_format = g_textAtom;
+#endif // wxUSE_UNICODE/!wxUSE_UNICODE

     else
     if (m_type == wxDF_BITMAP)
     else
     if (m_type == wxDF_BITMAP)

-    {
-        m_id = _T("image/png");
-    }
+        m_format = g_pngAtom;

     else
     if (m_type == wxDF_FILENAME)
     else
     if (m_type == wxDF_FILENAME)

-    {
-        m_id = _T("file:ALL");
-    }
+        m_format = g_fileAtom;
+    else
+    if (m_type == wxDF_HTML)
+        m_format = g_htmlAtom;

     else
     {
     else
     {

-       wxFAIL_MSG( _T("invalid dataformat") );
+       wxFAIL_MSG( wxT("invalid dataformat") );

     }
     }

-
-    m_hasAtom = FALSE;

 }
 
 wxDataFormatId wxDataFormat::GetType() const
 }
 
 wxDataFormatId wxDataFormat::GetType() const


@@ -127,394 +111,410 @@ wxDataFormatId wxDataFormat::GetType() const
 
 wxString wxDataFormat::GetId() const
 {
 
 wxString wxDataFormat::GetId() const
 {

-    return m_id;
+    wxGtkString atom_name(gdk_atom_name(m_format));
+    return wxString::FromAscii(atom_name);

 }
 
 }
 

-void wxDataFormat::SetId( const wxChar *id )
+void wxDataFormat::SetId( NativeFormat format )

 {
 {

-    m_type = wxDF_PRIVATE;
-    m_id = id;
-    m_hasAtom = FALSE;
+    PrepareFormats();
+    m_format = format;
+
+    if (m_format == g_textAtom)
+#if wxUSE_UNICODE
+        m_type = wxDF_UNICODETEXT;
+#else
+        m_type = wxDF_TEXT;
+#endif
+    else
+    if (m_format == g_altTextAtom)
+        m_type = wxDF_TEXT;
+    else
+    if (m_format == g_pngAtom)
+        m_type = wxDF_BITMAP;
+    else
+    if (m_format == g_fileAtom)
+        m_type = wxDF_FILENAME;
+    else
+    if (m_format == g_htmlAtom)
+        m_type = wxDF_HTML;
+    else
+        m_type = wxDF_PRIVATE;

 }
 
 }
 

-GdkAtom wxDataFormat::GetAtom()
+void wxDataFormat::SetId( const wxString& id )

 {
 {

-    if (!m_hasAtom)
-    {
-        m_hasAtom = TRUE;
-
-       if (m_type == wxDF_TEXT)
-       {
-            m_atom = g_textAtom;
-        }
-       else
-        if (m_type == wxDF_BITMAP)
-        {
-            m_atom = GDK_TARGET_BITMAP;
-        }
-       else
-        if (m_type == wxDF_PRIVATE)
-        {
-            m_atom = gdk_atom_intern( MBSTRINGCAST m_id.mbc_str(), FALSE );
-        }
-       else
-       if (m_type == wxDF_FILENAME)
-       {
-           m_atom = gdk_atom_intern( "file:ALL", FALSE );
-       }
-       else
-       {
-           m_hasAtom = FALSE;
-           m_atom = (GdkAtom) 0;
-       }
-    }
-
-    return m_atom;
+    PrepareFormats();
+    m_type = wxDF_PRIVATE;
+    m_format = gdk_atom_intern( id.ToAscii(), FALSE );

 }
 
 void wxDataFormat::PrepareFormats()
 {
 }
 
 void wxDataFormat::PrepareFormats()
 {

-    if (!g_textAtom) g_textAtom = gdk_atom_intern( "STRING", FALSE );
-    if (!g_pngAtom) g_pngAtom = gdk_atom_intern( "image/png", FALSE );
+    // VZ: GNOME included in RedHat 6.1 uses the MIME types below and not the
+    //     atoms STRING and file:ALL as the old code was, but normal X apps
+    //     use STRING for text selection when transferring the data via
+    //     clipboard, for example, so do use STRING for now (GNOME apps will
+    //     probably support STRING as well for compatibility anyhow), but use
+    //     text/uri-list for file dnd because compatibility is not important
+    //     here (with whom?)
+    if (!g_textAtom)
+    {
+#if wxUSE_UNICODE
+        g_textAtom = gdk_atom_intern( "UTF8_STRING", FALSE );
+        g_altTextAtom = gdk_atom_intern( "STRING", FALSE );
+#else
+        g_textAtom = gdk_atom_intern( "STRING" /* "text/plain" */, FALSE );
+#endif
+    }
+    if (!g_pngAtom)
+        g_pngAtom = gdk_atom_intern( "image/png", FALSE );
+    if (!g_fileAtom)
+        g_fileAtom = gdk_atom_intern( "text/uri-list", FALSE );
+    if (!g_htmlAtom)
+        g_htmlAtom = gdk_atom_intern( "text/html", FALSE );

 }
 
 //-------------------------------------------------------------------------
 }
 
 //-------------------------------------------------------------------------

-// wxDataBroker
+// wxDataObject

 //-------------------------------------------------------------------------
 
 //-------------------------------------------------------------------------
 

-IMPLEMENT_CLASS(wxDataBroker,wxObject)
-
-wxDataBroker::wxDataBroker()
-{
-    m_dataObjects.DeleteContents(TRUE);
-    m_preferred = 0;
-}
-
-void wxDataBroker::Add( wxDataObject *dataObject, bool preferred )
+wxDataObject::wxDataObject()

 {
 {

-    if (preferred) m_preferred = m_dataObjects.GetCount();
-    m_dataObjects.Append( dataObject );

 }
 
 }
 

-size_t wxDataBroker::GetFormatCount() const
+wxDataObject::~wxDataObject()

 {
 {

-    return m_dataObjects.GetCount();
+    // dtor is empty but needed for Darwin and AIX -- otherwise it doesn't link

 }
 
 }
 

-wxDataFormatId wxDataBroker::GetPreferredFormat() const
+bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir) const

 {
 {

-    wxNode *node = m_dataObjects.Nth( m_preferred );
-
-    wxASSERT( node );
-
-    wxDataObject* data_obj = (wxDataObject*)node->Data();
-
-    return data_obj->GetFormat().GetType();
-}
-
-wxDataFormat &wxDataBroker::GetNthFormat( size_t nth ) const
-{
-    wxNode *node = m_dataObjects.Nth( nth );
-
-    wxASSERT( node );
-
-    wxDataObject* data_obj = (wxDataObject*)node->Data();
-
-    return data_obj->GetFormat();
-}
-
-bool wxDataBroker::IsSupportedFormat( wxDataFormat &format ) const
-{
-    wxNode *node = m_dataObjects.First();
-    while (node)
+    size_t nFormatCount = GetFormatCount(dir);
+    if ( nFormatCount == 1 )

     {
     {

-        wxDataObject *dobj = (wxDataObject*)node->Data();
-
-       if (dobj->GetFormat().GetAtom() == format.GetAtom())
-       {
-           return TRUE;
-       }
-
-        node = node->Next();
+        return format == GetPreferredFormat();

     }
     }

-
-    return FALSE;
-}
-
-size_t wxDataBroker::GetSize( wxDataFormat& format ) const
-{
-    wxNode *node = m_dataObjects.First();
-    while (node)
+    else

     {
     {

-        wxDataObject *dobj = (wxDataObject*)node->Data();
-
-       if (dobj->GetFormat().GetAtom() == format.GetAtom())
-       {
-           return dobj->GetSize();
-       }
-
-        node = node->Next();
-    }
-
-    return 0;
-}
+        wxDataFormat *formats = new wxDataFormat[nFormatCount];
+        GetAllFormats(formats,dir);

 
 

-void wxDataBroker::WriteData( wxDataFormat& format, void *dest ) const
-{
-    wxNode *node = m_dataObjects.First();
-    while (node)
-    {
-        wxDataObject *dobj = (wxDataObject*)node->Data();
+        size_t n;
+        for ( n = 0; n < nFormatCount; n++ )
+        {
+            if ( formats[n] == format )
+                break;
+        }

 
 

-       if (dobj->GetFormat().GetAtom() == format.GetAtom())
-       {
-           dobj->WriteData( dest );
-       }
+        delete [] formats;

 
 

-        node = node->Next();
+        // found?
+        return n < nFormatCount;

     }
 }
 
     }
 }
 

-//-------------------------------------------------------------------------
-// wxDataObject
-//-------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS( wxDataObject, wxObject )
-
-wxDataObject::wxDataObject()
-{
-}
-
-wxDataObject::~wxDataObject()
-{
-}
-
-wxDataFormat &wxDataObject::GetFormat()
-{
-    return m_format;
-}
+// ----------------------------------------------------------------------------
+// wxTextDataObject
+// ----------------------------------------------------------------------------

 
 

-wxDataFormatId wxDataObject::GetFormatType() const
-{
-    return m_format.GetType();
-}
+#if wxUSE_UNICODE

 
 

-wxString wxDataObject::GetFormatId() const
+void
+wxTextDataObject::GetAllFormats(wxDataFormat *formats,
+                                wxDataObjectBase::Direction WXUNUSED(dir)) const

 {
 {

-    return m_format.GetId();
+    *formats++ = GetPreferredFormat();
+    *formats = g_altTextAtom;

 }
 
 }
 

-GdkAtom wxDataObject::GetFormatAtom() const
-{
-    GdkAtom ret = ((wxDataObject*) this)->m_format.GetAtom();
-    return ret;
-}
+#endif // wxUSE_UNICODE

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// wxTextDataObject
+// wxFileDataObject

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS( wxTextDataObject, wxDataObject )
-
-wxTextDataObject::wxTextDataObject()
+bool wxFileDataObject::GetDataHere(void *buf) const

 {
 {

-    m_format.SetType( wxDF_TEXT );
-}
+    wxString filenames;

 
 

-wxTextDataObject::wxTextDataObject( const wxString& data )
-{
-    m_format.SetType( wxDF_TEXT );
+    for (size_t i = 0; i < m_filenames.GetCount(); i++)
+    {
+        filenames += wxT("file:");
+        filenames += m_filenames[i];
+        filenames += wxT("\r\n");
+    }

 
 

-    m_data = data;
-}
+    memcpy( buf, filenames.mbc_str(), filenames.length() + 1 );

 
 

-void wxTextDataObject::SetText( const wxString& data )
-{
-    m_data = data;
+    return true;

 }
 
 }
 

-wxString wxTextDataObject::GetText() const
+size_t wxFileDataObject::GetDataSize() const

 {
 {

-    return m_data;
-}
+    size_t res = 0;

 
 

-void wxTextDataObject::WriteData( void *dest ) const
-{
-    WriteString( m_data, dest );
-}
+    for (size_t i = 0; i < m_filenames.GetCount(); i++)
+    {
+        // This is junk in UTF-8
+        res += m_filenames[i].length();
+        res += 5 + 2; // "file:" (5) + "\r\n" (2)
+    }

 
 

-size_t wxTextDataObject::GetSize() const
-{
-    return m_data.Len() + 1;
+    return res + 1;

 }
 
 }
 

-void wxTextDataObject::WriteString( const wxString &str, void *dest ) const
+bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)

 {
 {

-    memcpy( dest, str.mb_str(), str.Len()+1 );
-}
+    // we get data in the text/uri-list format, i.e. as a sequence of URIs
+    // (filenames prefixed by "file:") delimited by "\r\n". size includes
+    // the trailing zero (in theory, not for Nautilus in early GNOME
+    // versions).

 
 

-// ----------------------------------------------------------------------------
-// wxFileDataObject
-// ----------------------------------------------------------------------------
+    m_filenames.Empty();

 
 

-IMPLEMENT_DYNAMIC_CLASS( wxFileDataObject, wxDataObject )
+    const gchar *nexttemp = (const gchar*) buf;
+    for ( ; ; )
+    {
+        int len = 0;
+        const gchar *temp = nexttemp;
+        for (;;)
+        {
+            if (temp[len] == 0)
+            {
+                if (len > 0)
+                {
+                    // if an app omits '\r''\n'
+                    nexttemp = temp+len;
+                    break;
+                }
+
+                return true;
+            }
+            if (temp[len] == '\r')
+            {
+                if (temp[len+1] == '\n')
+                    nexttemp = temp+len+2;
+                else
+                    nexttemp = temp+len+1;
+                break;
+            }
+            len++;
+        }

 
 

-wxFileDataObject::wxFileDataObject()
-{
-    m_format.SetType( wxDF_FILENAME );
-}
+        if (len == 0)
+            break;

 
 

-void wxFileDataObject::AddFile( const wxString &file )
-{
-    m_files += file;
-    m_files += (wxChar)0;
-}
+        // required to give it a trailing zero
+        gchar *uri = g_strndup( temp, len );

 
 

-wxString wxFileDataObject::GetFiles() const
-{
-    return m_files;
-}
+        gchar *fn = g_filename_from_uri( uri, NULL, NULL );

 
 

-void wxFileDataObject::WriteData( void *dest ) const
-{
-    memcpy( dest, m_files.mbc_str(), GetSize() );
+        g_free( uri );
+
+        if (fn)
+        {
+            AddFile( wxConvFileName->cMB2WX( fn ) );
+            g_free( fn );
+        }
+    }
+
+    return true;

 }
 
 }
 

-size_t wxFileDataObject::GetSize() const
+void wxFileDataObject::AddFile( const wxString &filename )

 {
 {

-    return m_files.Len() + 1;
+   m_filenames.Add( filename );

 }
 
 // ----------------------------------------------------------------------------
 // wxBitmapDataObject
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // wxBitmapDataObject
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS( wxBitmapDataObject, wxDataObject )
-

 wxBitmapDataObject::wxBitmapDataObject()
 {
 wxBitmapDataObject::wxBitmapDataObject()
 {

-    m_format.SetType( wxDF_BITMAP );
-    m_pngData = (char*)NULL;
-    m_pngSize = 0;
+    Init();

 }
 
 wxBitmapDataObject::wxBitmapDataObject( const wxBitmap& bitmap )
 }
 
 wxBitmapDataObject::wxBitmapDataObject( const wxBitmap& bitmap )

+                  : wxBitmapDataObjectBase(bitmap)

 {
 {

-    m_format.SetType( wxDF_BITMAP );
-    m_pngData = (char*)NULL;
-    m_pngSize = 0;
-    m_bitmap = bitmap;
+    Init();
+

     DoConvertToPng();
 }
 
 wxBitmapDataObject::~wxBitmapDataObject()
 {
     DoConvertToPng();
 }
 
 wxBitmapDataObject::~wxBitmapDataObject()
 {

-    if (m_pngData) delete[] m_pngData;
+    Clear();

 }
 
 void wxBitmapDataObject::SetBitmap( const wxBitmap &bitmap )
 {
 }
 
 void wxBitmapDataObject::SetBitmap( const wxBitmap &bitmap )
 {

-    m_bitmap = bitmap;
+    ClearAll();
+
+    wxBitmapDataObjectBase::SetBitmap(bitmap);
+

     DoConvertToPng();
 }
 
     DoConvertToPng();
 }
 

-wxBitmap wxBitmapDataObject::GetBitmap() const
+bool wxBitmapDataObject::GetDataHere(void *buf) const

 {
 {

-    return m_bitmap;
-}
+    if ( !m_pngSize )
+    {
+        wxFAIL_MSG( wxT("attempt to copy empty bitmap failed") );

 
 

-void wxBitmapDataObject::WriteData( void *dest ) const
-{
-    WriteBitmap( m_bitmap, dest );
-}
+        return false;
+    }

 
 

-size_t wxBitmapDataObject::GetSize() const
-{
-    return m_pngSize;
-}
+    memcpy(buf, m_pngData, m_pngSize);

 
 

-void wxBitmapDataObject::WriteBitmap( const wxBitmap &WXUNUSED(bitmap), void *dest ) const
-{
-//    if (m_bitmap == bitmap)
-        memcpy( dest, m_pngData, m_pngSize );
+    return true;

 }
 
 }
 

-void wxBitmapDataObject::SetPngData( const char *pngData, size_t pngSize )
+bool wxBitmapDataObject::SetData(size_t size, const void *buf)

 {
 {

-    if (m_pngData) delete[] m_pngData;
-    m_pngData = (char*) NULL;
-    m_pngSize = pngSize;
-    m_pngData = new char[m_pngSize];
-    memcpy( m_pngData, pngData, m_pngSize );
-    
-    wxMemoryInputStream mstream( pngData, pngSize );
+    Clear();
+
+    wxCHECK_MSG( wxImage::FindHandler(wxBITMAP_TYPE_PNG) != NULL,
+                 false, wxT("You must call wxImage::AddHandler(new wxPNGHandler); to be able to use clipboard with bitmaps!") );
+
+    m_pngSize = size;
+    m_pngData = malloc(m_pngSize);
+
+    memcpy(m_pngData, buf, m_pngSize);
+
+    wxMemoryInputStream mstream((char*) m_pngData, m_pngSize);

     wxImage image;
     wxImage image;

-    wxPNGHandler handler;
-    handler.LoadFile( &image, mstream );
-    m_bitmap = image.ConvertToBitmap();
+    if ( !image.LoadFile( mstream, wxBITMAP_TYPE_PNG ) )
+    {
+        return false;
+    }
+
+    m_bitmap = wxBitmap(image);
+
+    return m_bitmap.IsOk();

 }
 
 void wxBitmapDataObject::DoConvertToPng()
 {
 }
 
 void wxBitmapDataObject::DoConvertToPng()
 {

-    if (m_pngData) delete[] m_pngData;
-    
-    wxImage image( m_bitmap );
-    wxPNGHandler handler;
-    
+    if ( !m_bitmap.IsOk() )
+        return;
+
+    wxCHECK_RET( wxImage::FindHandler(wxBITMAP_TYPE_PNG) != NULL,
+                 wxT("You must call wxImage::AddHandler(new wxPNGHandler); to be able to use clipboard with bitmaps!") );
+
+    wxImage image = m_bitmap.ConvertToImage();
+

     wxCountingOutputStream count;
     wxCountingOutputStream count;

-    handler.SaveFile( &image, count );
+    image.SaveFile(count, wxBITMAP_TYPE_PNG);
+

     m_pngSize = count.GetSize() + 100; // sometimes the size seems to vary ???
     m_pngSize = count.GetSize() + 100; // sometimes the size seems to vary ???

-    m_pngData = new char[m_pngSize];
-    
-    wxMemoryOutputStream mstream( m_pngData, m_pngSize );
-    handler.SaveFile( &image, mstream );
+    m_pngData = malloc(m_pngSize);
+
+    wxMemoryOutputStream mstream((char*) m_pngData, m_pngSize);
+    image.SaveFile(mstream, wxBITMAP_TYPE_PNG);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// wxPrivateDataObject
+// wxURLDataObject

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS( wxPrivateDataObject, wxDataObject )
-
-void wxPrivateDataObject::Free()
+class wxTextURIListDataObject : public wxDataObjectSimple

 {
 {

-    if ( m_data )
-        free(m_data);
-}
+public:
+    wxTextURIListDataObject(const wxString& url)
+        : wxDataObjectSimple(wxDataFormat(g_fileAtom)),
+          m_url(url)
+    {
+    }

 
 

-wxPrivateDataObject::wxPrivateDataObject()
-{
-    wxString id = _T("application/");
-    id += wxTheApp->GetAppName();
+    const wxString& GetURL() const { return m_url; }
+    void SetURL(const wxString& url) { m_url = url; }

 
 

-    m_format.SetId( id );

 
 

-    m_size = 0;
-    m_data = (void *)NULL;
-}
+    virtual size_t GetDataSize() const
+    {
+        // It is not totally clear whether we should include "\r\n" at the end
+        // of the string if there is only one URL or not, but not doing it
+        // doesn't seem to create any problems, so keep things simple.
+        return strlen(m_url.utf8_str()) + 1;
+    }

 
 

-void wxPrivateDataObject::SetData( const void *data, size_t size )
-{
-    Free();
+    virtual bool GetDataHere(void *buf) const
+    {
+        char* const dst = static_cast<char*>(buf);

 
 

-    m_size = size;
-    m_data = malloc(size);
+        strcpy(dst, m_url.utf8_str());

 
 

-    memcpy( m_data, data, size );
-}
+        return true;
+    }
+
+    virtual bool SetData(size_t len, const void *buf)
+    {
+        const char* const src = static_cast<const char*>(buf);
+
+        // The string might be "\r\n"-terminated but this is not necessarily
+        // the case (e.g. when dragging an URL from Firefox, it isn't).
+        if ( len > 1 && src[len - 1] == '\n' )
+        {
+            if ( len > 2 && src[len - 2] == '\r' )
+                len--;
+
+            len--;
+        }
+
+        m_url = wxString::FromUTF8(src, len);
+
+        return true;
+    }

 
 

-void wxPrivateDataObject::WriteData( void *dest ) const
+    // Must provide overloads to avoid hiding them (and warnings about it)
+    virtual size_t GetDataSize(const wxDataFormat&) const
+    {
+        return GetDataSize();
+    }
+    virtual bool GetDataHere(const wxDataFormat&, void *buf) const
+    {
+        return GetDataHere(buf);
+    }
+    virtual bool SetData(const wxDataFormat&, size_t len, const void *buf)
+    {
+        return SetData(len, buf);
+    }
+
+private:
+    wxString m_url;
+};
+
+wxURLDataObject::wxURLDataObject(const wxString& url) :
+    m_dobjURIList(new wxTextURIListDataObject(url)),
+    m_dobjText(new wxTextDataObject(url))

 {
 {

-    WriteData( m_data, dest );
+    // Use both URL-specific format and a plain text one to ensure that URLs
+    // can be pasted into any application.
+    Add(m_dobjURIList, true /* preferred */);
+    Add(m_dobjText);

 }
 
 }
 

-size_t wxPrivateDataObject::GetSize() const
+void wxURLDataObject::SetURL(const wxString& url)

 {
 {

-    return m_size;
+    m_dobjURIList->SetURL(url);
+    m_dobjText->SetText(url);

 }
 
 }
 

-void wxPrivateDataObject::WriteData( const void *data, void *dest ) const
+wxString wxURLDataObject::GetURL() const

 {
 {

-    memcpy( dest, data, GetSize() );
+    if ( GetReceivedFormat() == g_fileAtom )
+    {
+        // If we received the URL as an URI, use it.
+        return m_dobjURIList->GetURL();
+    }
+    else // Otherwise we either got it as text or didn't get anything yet.
+    {
+        // In either case using the text format should be fine.
+        return m_dobjText->GetText();
+    }

 }
 
 }
 

+#endif // wxUSE_DATAOBJ