#include "wx/wxprec.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/uri.h"
#include <gdk/gdk.h>
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
if (m_type == wxDF_TEXT || m_type == wxDF_UNICODETEXT)
m_format = g_textAtom;
+#endif
else
if (m_type == wxDF_BITMAP)
m_format = g_pngAtom;
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)
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();
- // 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++ )
{
lenPrefix += 2;
}
- AddFile(filename.c_str() + lenPrefix);
+ AddFile(wxURI::Unescape(filename.c_str() + lenPrefix));
filename.Empty();
}
else
filename += *p;
}
}
-#endif // 0/1
return TRUE;
}
image.SaveFile(mstream, wxBITMAP_TYPE_PNG);
}
-
+#endif // wxUSE_DATAOBJ