simplify/cleanup wxTheXXXList and wxGDIObject code (patch 1452023 from Paul Cornett)

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

diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp
index 2b0f4f43aeef3ceb856e31054f8ca3c1e634e3ea..7fdc0744fbbb03604cf41d6d907672d7f5f35b83 100644 (file)
--- a/src/gtk1/dataobj.cpp
+++ b/src/gtk1/dataobj.cpp
@@ -7,16 +7,19 @@
 // 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"

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

+
+#if wxUSE_DATAOBJ
+

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

+#include "wx/uri.h"

 
 #include <gdk/gdk.h>
 
 
 #include <gdk/gdk.h>
 


@@ -25,6 +28,7 @@
 //-------------------------------------------------------------------------
 
 GdkAtom  g_textAtom        = 0;
 //-------------------------------------------------------------------------
 
 GdkAtom  g_textAtom        = 0;

+GdkAtom  g_altTextAtom     = 0;

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


@@ -73,14 +77,18 @@ wxDataFormat::wxDataFormat( NativeFormat format )
 void wxDataFormat::SetType( wxDataFormatId type )
 {
     PrepareFormats();
 void wxDataFormat::SetType( wxDataFormatId type )
 {
     PrepareFormats();

-    
-    if (type == wxDF_UNICODETEXT)
-       type = wxDF_TEXT;

 
     m_type = type;
 
     m_type = type;

-    
-    if (m_type == wxDF_TEXT)
+
+#if wxUSE_UNICODE
+    if (m_type == wxDF_UNICODETEXT)

         m_format = g_textAtom;
         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;
+#endif

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


@@ -100,7 +108,9 @@ wxDataFormatId wxDataFormat::GetType() const
 
 wxString wxDataFormat::GetId() const
 {
 
 wxString wxDataFormat::GetId() const
 {

-    wxString ret = wxString::FromAscii( gdk_atom_name( m_format ) );
+    gchar* atom_name = gdk_atom_name( m_format );
+    wxString ret = wxString::FromAscii( atom_name );
+    g_free(atom_name);

     return ret;
 }
 
     return ret;
 }
 


@@ -110,6 +120,13 @@ void wxDataFormat::SetId( NativeFormat format )
     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)


@@ -126,7 +143,7 @@ void wxDataFormat::SetId( const wxChar *id )
     PrepareFormats();
     m_type = wxDF_PRIVATE;
     wxString tmp( id );
     PrepareFormats();
     m_type = wxDF_PRIVATE;
     wxString tmp( id );

-    m_format = gdk_atom_intern( (const char*) tmp.ToAscii(), FALSE ); 
+    m_format = gdk_atom_intern( (const char*) tmp.ToAscii(), FALSE );

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


@@ -141,6 +158,7 @@ void wxDataFormat::PrepareFormats()
     if (!g_textAtom)
 #if wxUSE_UNICODE
         g_textAtom = gdk_atom_intern( "UTF8_STRING", FALSE );
     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
 #else
         g_textAtom = gdk_atom_intern( "STRING" /* "text/plain" */, FALSE );
 #endif


@@ -166,17 +184,17 @@ wxDataObject::~wxDataObject()
 bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir) const
 {
     size_t nFormatCount = GetFormatCount(dir);
 bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir) const
 {
     size_t nFormatCount = GetFormatCount(dir);

-    if ( nFormatCount == 1 ) 
+    if ( nFormatCount == 1 )

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

-    else 
+    else

     {
         wxDataFormat *formats = new wxDataFormat[nFormatCount];
         GetAllFormats(formats,dir);
 
         size_t n;
     {
         wxDataFormat *formats = new wxDataFormat[nFormatCount];
         GetAllFormats(formats,dir);
 
         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;


@@ -199,8 +217,9 @@ bool wxFileDataObject::GetDataHere(void *buf) const
 
     for (size_t i = 0; i < m_filenames.GetCount(); i++)
     {
 
     for (size_t i = 0; i < m_filenames.GetCount(); i++)
     {

+        filenames += wxT("file:");

         filenames += m_filenames[i];
         filenames += m_filenames[i];

-        filenames += (wxChar) 0;
+        filenames += wxT("\r\n");

     }
 
     memcpy( buf, filenames.mbc_str(), filenames.Len() + 1 );
     }
 
     memcpy( buf, filenames.mbc_str(), filenames.Len() + 1 );


@@ -214,8 +233,9 @@ size_t wxFileDataObject::GetDataSize() const
 
     for (size_t i = 0; i < m_filenames.GetCount(); i++)
     {
 
     for (size_t i = 0; i < m_filenames.GetCount(); i++)
     {

+        // This is junk in UTF-8

         res += m_filenames[i].Len();
         res += m_filenames[i].Len();

-        res += 1;
+        res += 5 + 2; // "file:" (5) + "\r\n" (2)

     }
 
     return res + 1;
     }
 
     return res + 1;


@@ -223,28 +243,10 @@ size_t wxFileDataObject::GetDataSize() const
 
 bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)
 {
 
 bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)
 {

-    // VZ: old format
-#if 0
-    // filenames are stores as a string with #0 as deliminators
-    const char *filenames = (const char*) buf;
-    size_t pos = 0;
-    for(;;)
-    {
-        if (filenames[0] == 0)
-            break;
-        if (pos >= size)
-            break;
-        wxString file( filenames );  // this returns the first file
-        AddFile( file );
-        pos += file.Len()+1;
-        filenames += file.Len()+1;
-    }
-#else // 1

     m_filenames.Empty();
 
     m_filenames.Empty();
 

-    // the text/uri-list format is a sequence of URIs (filenames prefixed by
-    // "file:" as far as I see) delimited by "\r\n" of total length size
-    // (I wonder what happens if the file has '\n' in its filename??)
+    // 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++ )
     {
     wxString filename;
     for ( const char *p = (const char *)buf; ; p++ )
     {


@@ -265,7 +267,7 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)
                     lenPrefix += 2;
                 }
 
                     lenPrefix += 2;
                 }
 

-                AddFile(filename.c_str() + lenPrefix);
+                AddFile(wxURI::Unescape(filename.c_str() + lenPrefix));

                 filename.Empty();
             }
             else
                 filename.Empty();
             }
             else


@@ -285,7 +287,6 @@ bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)
             filename += *p;
         }
     }
             filename += *p;
         }
     }

-#endif // 0/1

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -384,4 +385,4 @@ void wxBitmapDataObject::DoConvertToPng()
     image.SaveFile(mstream, wxBITMAP_TYPE_PNG);
 }
 
     image.SaveFile(mstream, wxBITMAP_TYPE_PNG);
 }
 

-
+#endif // wxUSE_DATAOBJ