Eliminate a warning

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

diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp
index 401dca0db08ec576f742f0633aff9ac960f674fe..927d7e14daa928150e942e12b842540587c6bca3 100644 (file)
--- a/src/gtk1/dataobj.cpp
+++ b/src/gtk1/dataobj.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

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

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


@@ -7,24 +7,30 @@
 // 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 <gdk/gdk.h>

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

+GdkAtom  g_altTextAtom     = 0;

 GdkAtom  g_pngAtom         = 0;
 GdkAtom  g_fileAtom        = 0;
 
 GdkAtom  g_pngAtom         = 0;
 GdkAtom  g_fileAtom        = 0;
 


@@ -34,7 +40,14 @@ GdkAtom  g_fileAtom        = 0;
 
 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_format = (GdkAtom) 0;
 }
     m_type = wxDF_INVALID;
     m_format = (GdkAtom) 0;
 }


@@ -45,13 +58,7 @@ wxDataFormat::wxDataFormat( wxDataFormatId type )
     SetType( type );
 }
 
     SetType( type );
 }
 

-wxDataFormat::wxDataFormat( const wxChar *id )
-{
-    PrepareFormats();
-    SetId( id );
-}
-
-wxDataFormat::wxDataFormat( const wxString &id )
+void wxDataFormat::InitFromString( const wxString &id )

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


@@ -65,10 +72,19 @@ wxDataFormat::wxDataFormat( NativeFormat format )
 
 void wxDataFormat::SetType( wxDataFormatId type )
 {
 
 void wxDataFormat::SetType( wxDataFormatId type )
 {

+    PrepareFormats();
+

     m_type = type;
 
     m_type = type;
 

-    if (m_type == wxDF_TEXT)
+#if wxUSE_UNICODE
+    if (m_type == wxDF_UNICODETEXT)
+        m_format = g_textAtom;
+    else if (m_type == wxDF_TEXT)
+        m_format = g_altTextAtom;
+#else
+    if (m_type == wxDF_TEXT || m_type == wxDF_UNICODETEXT)

         m_format = g_textAtom;
         m_format = g_textAtom;

+#endif

     else
     if (m_type == wxDF_BITMAP)
         m_format = g_pngAtom;
     else
     if (m_type == wxDF_BITMAP)
         m_format = g_pngAtom;


@@ -88,15 +104,25 @@ wxDataFormatId wxDataFormat::GetType() const
 
 wxString wxDataFormat::GetId() const
 {
 
 wxString wxDataFormat::GetId() const
 {

-    wxString ret( gdk_atom_name( m_format ) );  // this will convert from ascii to Unicode
+    gchar* atom_name = gdk_atom_name( m_format );
+    wxString ret = wxString::FromAscii( atom_name );
+    g_free(atom_name);

     return ret;
 }
 
 void wxDataFormat::SetId( NativeFormat format )
 {
     return ret;
 }
 
 void wxDataFormat::SetId( NativeFormat format )
 {

+    PrepareFormats();

     m_format = format;
 
     if (m_format == g_textAtom)
     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_TEXT;
     else
     if (m_format == g_pngAtom)


@@ -108,49 +134,63 @@ void wxDataFormat::SetId( NativeFormat format )
         m_type = wxDF_PRIVATE;
 }
 
         m_type = wxDF_PRIVATE;
 }
 

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

 {
 {

+    PrepareFormats();

     m_type = wxDF_PRIVATE;
     m_type = wxDF_PRIVATE;

-    wxString tmp( id );
-    m_format = gdk_atom_intern( wxMBSTRINGCAST tmp.mbc_str(), FALSE );  // what is the string cast for?
+    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) 
+    // 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 transfering 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 );
         g_pngAtom = gdk_atom_intern( "image/png", FALSE );

-    if (!g_fileAtom) 
-        g_fileAtom = gdk_atom_intern( "file:ALL", FALSE );
+    if (!g_fileAtom)
+        g_fileAtom = gdk_atom_intern( "text/uri-list", FALSE );

 }
 
 //-------------------------------------------------------------------------
 // wxDataObject
 //-------------------------------------------------------------------------
 
 }
 
 //-------------------------------------------------------------------------
 // wxDataObject
 //-------------------------------------------------------------------------
 

-IMPLEMENT_ABSTRACT_CLASS( wxDataObject, wxObject )
-

 wxDataObject::wxDataObject()
 {
 }
 
 wxDataObject::~wxDataObject()
 {
 wxDataObject::wxDataObject()
 {
 }
 
 wxDataObject::~wxDataObject()
 {

+    // dtor is empty but needed for Darwin and AIX -- otherwise it doesn't link

 }
 
 }
 

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

 {
 {

-    size_t nFormatCount = GetFormatCount();
-    if ( nFormatCount == 1 ) {
+    size_t nFormatCount = GetFormatCount(dir);
+    if ( nFormatCount == 1 )
+    {

         return format == GetPreferredFormat();
     }
         return format == GetPreferredFormat();
     }

-    else {
+    else
+    {

         wxDataFormat *formats = new wxDataFormat[nFormatCount];
         wxDataFormat *formats = new wxDataFormat[nFormatCount];

-        GetAllFormats(formats);
+        GetAllFormats(formats,dir);

 
         size_t n;
 
         size_t n;

-        for ( n = 0; n < nFormatCount; n++ ) {
+        for ( n = 0; n < nFormatCount; n++ )
+        {

             if ( formats[n] == format )
                 break;
         }
             if ( formats[n] == format )
                 break;
         }


@@ -162,231 +202,182 @@ bool wxDataObject::IsSupportedFormat(const wxDataFormat& format) const
     }
 }
 
     }
 }
 

-

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

-// wxTextDataObject
+// wxFileDataObject

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

-IMPLEMENT_DYNAMIC_CLASS( wxTextDataObject, wxDataObject )
-
-wxTextDataObject::wxTextDataObject() 
-{ 
-}
-
-wxTextDataObject::wxTextDataObject(const wxString& strText) 
-    : m_strText(strText) 
-{ 
-}
+bool wxFileDataObject::GetDataHere(void *buf) const
+{
+    wxString filenames;

 
 

-size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const
-{ 
-    return m_strText.Len() + 1;   // +1 for trailing '\0'of course
-}
+    for (size_t i = 0; i < m_filenames.GetCount(); i++)
+    {
+        filenames += wxT("file:");
+        filenames += m_filenames[i];
+        filenames += wxT("\r\n");
+    }

 
 

-bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
-{ 
-    memcpy(buf, m_strText.c_str(), GetDataSize(format)); 
-    return TRUE; 
-}
+    memcpy( buf, filenames.mbc_str(), filenames.length() + 1 );

 
 

-bool wxTextDataObject::SetData(const wxDataFormat& format, const void *buf)
-{ 
-    m_strText = (const wxChar *)buf; 
-    return TRUE;
+    return true;

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// wxFileDataObject
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS( wxFileDataObject, wxDataObject )
-
-wxFileDataObject::wxFileDataObject()
+size_t wxFileDataObject::GetDataSize() const

 {
 {

-}
+    size_t res = 0;

 
 

-void wxFileDataObject::AddFile( const wxString &file )
-{
-    m_files += file;
-    m_files += (wxChar)0;
-}
+    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)
+    }

 
 

-wxString wxFileDataObject::GetFiles() const
-{
-    return m_files;
+    return res + 1;

 }
 
 }
 

-bool wxFileDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
+bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)

 {
 {

-    if (format == wxDF_FILENAME)
+    m_filenames.Empty();
+
+    // we get data in the text/uri-list format, i.e. as a sequence of URIs
+    // (filenames prefixed by "file:") delimited by "\r\n"
+    wxString filename;
+    for ( const char *p = (const char *)buf; ; p++ )

     {
     {

-        memcpy( buf, m_files.mbc_str(), m_files.Len() + 1 );
-       return TRUE;
+        // some broken programs (testdnd GTK+ sample!) omit the trailing
+        // "\r\n", so check for '\0' explicitly here instead of doing it in
+        // the loop statement to account for it
+        if ( (*p == '\r' && *(p+1) == '\n') || !*p )
+        {
+            size_t lenPrefix = 5; // strlen("file:")
+            if ( filename.Left(lenPrefix).MakeLower() == _T("file:") )
+            {
+                // sometimes the syntax is "file:filename", sometimes it's
+                // URL-like: "file://filename" - deal with both
+                if ( filename[lenPrefix] == _T('/') &&
+                     filename[lenPrefix + 1] == _T('/') )
+                {
+                    // skip the slashes
+                    lenPrefix += 2;
+                }
+
+                AddFile(wxURI::Unescape(filename.c_str() + lenPrefix));
+                filename.Empty();
+            }
+            else
+            {
+                wxLogDebug(_T("Unsupported URI '%s' in wxFileDataObject"),
+                           filename.c_str());
+            }
+
+            if ( !*p )
+                break;
+
+            // skip '\r'
+            p++;
+        }
+        else
+        {
+            filename += *p;
+        }

     }
     }

-    
-    return FALSE;
-}

 
 

-size_t wxFileDataObject::GetDataSize(const wxDataFormat& format) const
-{
-    if (format != wxDF_FILENAME) return 0;
-    
-    return m_files.Len() + 1;
+    return true;

 }
 
 }
 

-bool wxFileDataObject::SetData(const wxDataFormat& format, const void *buf)
+void wxFileDataObject::AddFile( const wxString &filename )

 {
 {

-    if (format != wxDF_FILENAME)
-        return FALSE;
-       
-    m_files = (char*)(buf);  // this is so ugly, I cannot look at it
-    
-    return TRUE;
+   m_filenames.Add( filename );

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

-IMPLEMENT_DYNAMIC_CLASS( wxBitmapDataObject, wxDataObject )
-

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

-    m_pngData = (void*)NULL;
-    m_pngSize = 0;
+    Init();

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

+                  : wxBitmapDataObjectBase(bitmap)

 {
 {

-    m_pngData = (void*)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 )
 {

-    if (m_pngData) 
-        delete[] m_pngData;
-    m_pngData = (void*)NULL;
-    m_pngSize = 0;
-       
-    m_bitmap = bitmap;
-    DoConvertToPng();
-}
+    ClearAll();

 
 

-size_t wxBitmapDataObject::GetDataSize(const wxDataFormat& format) const
-{
-    if (format != wxDF_BITMAP) return 0;
-    
-    return m_pngSize;
+    wxBitmapDataObjectBase::SetBitmap(bitmap);
+
+    DoConvertToPng();

 }
 
 }
 

-bool wxBitmapDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
+bool wxBitmapDataObject::GetDataHere(void *buf) const

 {
 {

-    if (format != wxDF_BITMAP) return FALSE;
-    
-    if (m_pngSize > 0)
+    if ( !m_pngSize )

     {
     {

-        memcpy(buf, m_pngData, m_pngSize); 
-        return TRUE;
+        wxFAIL_MSG( wxT("attempt to copy empty bitmap failed") );
+
+        return false;

     }
     }

-    
-    return FALSE;
-}

 
 

-bool wxBitmapDataObject::SetData(const wxDataFormat& format, const void *buf)
-{
-    if (m_pngData) delete[] m_pngData;
-    m_pngData = (void*) NULL;
-    m_pngSize = 0;
-    m_bitmap = wxNullBitmap;
-    
-    return FALSE;
-}
+    memcpy(buf, m_pngData, m_pngSize);

 
 

-void wxBitmapDataObject::SetPngData(const void *buf, size_t size)
-{
-    if (m_pngData) delete[] m_pngData;
-    m_pngSize = size;
-    m_pngData = (void*) new char[m_pngSize];
-    
-    memcpy( m_pngData, buf, m_pngSize );
-    
-    wxMemoryInputStream mstream( (char*) m_pngData, m_pngSize );
-    wxImage image;
-    wxPNGHandler handler;
-    handler.LoadFile( &image, mstream );
-    m_bitmap = image.ConvertToBitmap();
+    return true;

 }
 
 }
 

-void wxBitmapDataObject::DoConvertToPng()
+bool wxBitmapDataObject::SetData(size_t size, const void *buf)

 {
 {

-    if (!m_bitmap.Ok()) return;
-    
-    wxImage image( m_bitmap );
-    wxPNGHandler handler;
-    
-    wxCountingOutputStream count;
-    handler.SaveFile( &image, count );
-    m_pngSize = count.GetSize() + 100; // sometimes the size seems to vary ???
-    m_pngData = (void*) new char[m_pngSize];
-    
-    wxMemoryOutputStream mstream( (char*) m_pngData, m_pngSize );
-    handler.SaveFile( &image, mstream );
-}
+    Clear();

 
 

-// ----------------------------------------------------------------------------
-// wxPrivateDataObject
-// ----------------------------------------------------------------------------
+    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!") );

 
 

-IMPLEMENT_CLASS( wxPrivateDataObject, wxDataObject )
+    m_pngSize = size;
+    m_pngData = malloc(m_pngSize);

 
 

-void wxPrivateDataObject::Free()
-{
-    if ( m_data )
-        free(m_data);
-}
+    memcpy(m_pngData, buf, m_pngSize);

 
 

-wxPrivateDataObject::wxPrivateDataObject()
-{
-    wxString id = wxT("application/");
-    id += wxTheApp->GetAppName();
+    wxMemoryInputStream mstream((char*) m_pngData, m_pngSize);
+    wxImage image;
+    if ( !image.LoadFile( mstream, wxBITMAP_TYPE_PNG ) )
+    {
+        return false;
+    }

 
 

-    m_format.SetId( id );
+    m_bitmap = wxBitmap(image);

 
 

-    m_size = 0;
-    m_data = (void *)NULL;
+    return m_bitmap.Ok();

 }
 
 }
 

-void wxPrivateDataObject::SetData( const void *data, size_t size )
+void wxBitmapDataObject::DoConvertToPng()

 {
 {

-    Free();
+    if ( !m_bitmap.Ok() )
+        return;

 
 

-    m_size = size;
-    m_data = malloc(size);
+    wxCHECK_RET( wxImage::FindHandler(wxBITMAP_TYPE_PNG) != NULL,
+                 wxT("You must call wxImage::AddHandler(new wxPNGHandler); to be able to use clipboard with bitmaps!") );

 
 

-    memcpy( m_data, data, size );
-}
+    wxImage image = m_bitmap.ConvertToImage();

 
 

-void wxPrivateDataObject::WriteData( void *dest ) const
-{
-    WriteData( m_data, dest );
-}
+    wxCountingOutputStream count;
+    image.SaveFile(count, wxBITMAP_TYPE_PNG);

 
 

-size_t wxPrivateDataObject::GetSize() const
-{
-    return m_size;
-}
+    m_pngSize = count.GetSize() + 100; // sometimes the size seems to vary ???
+    m_pngData = malloc(m_pngSize);

 
 

-void wxPrivateDataObject::WriteData( const void *data, void *dest ) const
-{
-    memcpy( dest, data, GetSize() );
+    wxMemoryOutputStream mstream((char*) m_pngData, m_pngSize);
+    image.SaveFile(mstream, wxBITMAP_TYPE_PNG);

 }
 
 }
 

+#endif // wxUSE_DATAOBJ