AddBook ignores wxMac paths (still won't work)

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

diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp
index 41fd7843a1d426ff26c307ca21c549912767d92e..d5910702668eeaa07477555a3edca6adf4f4c8ef 100644 (file)
--- a/src/gtk1/dataobj.cpp
+++ b/src/gtk1/dataobj.cpp
@@ -17,7 +17,7 @@
 #include "wx/mstream.h"
 #include "wx/image.h"
 
 #include "wx/mstream.h"
 #include "wx/image.h"
 

-#include "gdk/gdk.h"
+#include <gdk/gdk.h>

 
 //-------------------------------------------------------------------------
 // global data
 
 //-------------------------------------------------------------------------
 // global data


@@ -127,9 +127,14 @@ void wxDataFormat::SetId( const wxChar *id )
 void wxDataFormat::PrepareFormats()
 {
     // VZ: GNOME included in RedHat 6.1 uses the MIME types below and not the
 void wxDataFormat::PrepareFormats()
 {
     // 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
+    //     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 (!g_textAtom)

-        g_textAtom = gdk_atom_intern( "text/plain", FALSE );
+        g_textAtom = gdk_atom_intern( "STRING" /* "text/plain" */, FALSE );

     if (!g_pngAtom)
         g_pngAtom = gdk_atom_intern( "image/png", FALSE );
     if (!g_fileAtom)
     if (!g_pngAtom)
         g_pngAtom = gdk_atom_intern( "image/png", FALSE );
     if (!g_fileAtom)


@@ -147,15 +152,18 @@ 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,7 +207,7 @@ size_t wxFileDataObject::GetDataSize() const
     return res + 1;
 }
 
     return res + 1;
 }
 

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

 {
     // VZ: old format
 #if 0
 {
     // VZ: old format
 #if 0


@@ -224,18 +232,36 @@ bool wxFileDataObject::SetData(size_t size, const void *buf)
     // "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??)
     wxString filename;
     // "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??)
     wxString filename;

-    for ( const char *p = (const char *)buf; *p; p++ )
+    for ( const char *p = (const char *)buf; ; p++ )

     {
     {

-        if ( *p == '\r' && *(p+1) == '\n' )
+        // 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 )

         {
         {

-            static const int lenPrefix = 5; // strlen("file:")
+            size_t lenPrefix = 5; // strlen("file:")

             if ( filename.Left(lenPrefix).MakeLower() == _T("file:") )
             {
             if ( filename.Left(lenPrefix).MakeLower() == _T("file:") )
             {

-                filename.erase(0, lenPrefix);
+                // 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(filename.c_str() + lenPrefix);
+                filename.Empty();
+            }
+            else
+            {
+                wxLogDebug(_T("Unsupported URI '%s' in wxFileDataObject"),
+                           filename.c_str());

             }
 
             }
 

-            AddFile(filename);
-            filename.Empty();
+            if ( !*p )
+                break;

 
             // skip '\r'
             p++;
 
             // skip '\r'
             p++;


@@ -304,6 +330,7 @@ bool wxBitmapDataObject::SetData(size_t size, const void *buf)
 {
     Clear();
 
 {
     Clear();
 

+#if wxUSE_LIBPNG

     m_pngSize = size;
     m_pngData = malloc(m_pngSize);
 
     m_pngSize = size;
     m_pngData = malloc(m_pngSize);
 


@@ -320,10 +347,14 @@ bool wxBitmapDataObject::SetData(size_t size, const void *buf)
     m_bitmap = image.ConvertToBitmap();
 
     return m_bitmap.Ok();
     m_bitmap = image.ConvertToBitmap();
 
     return m_bitmap.Ok();

+#else
+    return FALSE;
+#endif

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

+#if wxUSE_LIBPNG

     if (!m_bitmap.Ok())
         return;
 
     if (!m_bitmap.Ok())
         return;
 


@@ -338,6 +369,7 @@ void wxBitmapDataObject::DoConvertToPng()
 
     wxMemoryOutputStream mstream( (char*) m_pngData, m_pngSize );
     handler.SaveFile( &image, mstream );
 
     wxMemoryOutputStream mstream( (char*) m_pngData, m_pngSize );
     handler.SaveFile( &image, mstream );

+#endif

 }
 
 
 }