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;
}
void wxDataFormat::SetType( wxDataFormatId type )
{
+ PrepareFormats();
m_type = type;
if (m_type == wxDF_TEXT)
void wxDataFormat::SetId( NativeFormat format )
{
+ PrepareFormats();
m_format = format;
if (m_format == g_textAtom)
void wxDataFormat::SetId( const wxChar *id )
{
+ PrepareFormats();
m_type = wxDF_PRIVATE;
wxString tmp( id );
m_format = gdk_atom_intern( wxMBSTRINGCAST tmp.mbc_str(), FALSE ); // what is the string cast for?
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, 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)
- g_textAtom = gdk_atom_intern( "STRING", FALSE );
+ g_textAtom = gdk_atom_intern( "STRING" /* "text/plain" */, FALSE );
if (!g_pngAtom)
g_pngAtom = gdk_atom_intern( "image/png", FALSE );
if (!g_fileAtom)
- g_fileAtom = gdk_atom_intern( "file:ALL", FALSE );
+ g_fileAtom = gdk_atom_intern( "text/uri-list", FALSE );
}
//-------------------------------------------------------------------------
// wxDataObject
//-------------------------------------------------------------------------
-IMPLEMENT_ABSTRACT_CLASS( wxDataObject, wxObject )
-
wxDataObject::wxDataObject()
{
}
-wxDataObject::~wxDataObject()
-{
-}
-
-bool wxDataObject::IsSupportedFormat(const wxDataFormat& format) const
+bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir) const
{
- size_t nFormatCount = GetFormatCount();
+ size_t nFormatCount = GetFormatCount(dir);
if ( nFormatCount == 1 ) {
return format == GetPreferredFormat();
}
else {
wxDataFormat *formats = new wxDataFormat[nFormatCount];
- GetAllFormats(formats);
+ GetAllFormats(formats,dir);
size_t n;
for ( n = 0; n < nFormatCount; n++ ) {
bool wxFileDataObject::GetDataHere(void *buf) const
{
- const wxString& filenames = GetFilenames();
+ wxString filenames;
+
+ for (size_t i = 0; i < m_filenames.GetCount(); i++)
+ {
+ filenames += m_filenames[i];
+ filenames += (wxChar) 0;
+ }
+
memcpy( buf, filenames.mbc_str(), filenames.Len() + 1 );
return TRUE;
size_t wxFileDataObject::GetDataSize() const
{
- return GetFilenames().Len() + 1;
+ size_t res = 0;
+
+ for (size_t i = 0; i < m_filenames.GetCount(); i++)
+ {
+ res += m_filenames[i].Len();
+ res += 1;
+ }
+
+ return res + 1;
}
-bool wxFileDataObject::SetData(const void *buf)
+bool wxFileDataObject::SetData(size_t size, const void *buf)
{
- SetFilenames((const wxChar *)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??)
+ wxString filename;
+ for ( const char *p = (const char *)buf; ; p++ )
+ {
+ // 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(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;
+ }
+ }
+#endif // 0/1
return TRUE;
}
+void wxFileDataObject::AddFile( const wxString &filename )
+{
+ m_filenames.Add( filename );
+}
+
// ----------------------------------------------------------------------------
// wxBitmapDataObject
// ----------------------------------------------------------------------------
}
m_bitmap = image.ConvertToBitmap();
+
+ return m_bitmap.Ok();
}
void wxBitmapDataObject::DoConvertToPng()
handler.SaveFile( &image, mstream );
}
-// ----------------------------------------------------------------------------
-// wxPrivateDataObject
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_CLASS( wxPrivateDataObject, wxDataObject )
-
-void wxPrivateDataObject::Free()
-{
- if ( m_data )
- free(m_data);
-}
-
-wxPrivateDataObject::wxPrivateDataObject()
-{
- wxString id = wxT("application/");
- id += wxTheApp->GetAppName();
-
- m_format.SetId( id );
-
- m_size = 0;
- m_data = (void *)NULL;
-}
-
-void wxPrivateDataObject::SetData( const void *data, size_t size )
-{
- Free();
-
- m_size = size;
- m_data = malloc(size);
-
- memcpy( m_data, data, size );
-}
-
-void wxPrivateDataObject::WriteData( void *dest ) const
-{
- WriteData( m_data, dest );
-}
-
-size_t wxPrivateDataObject::GetSize() const
-{
- return m_size;
-}
-
-void wxPrivateDataObject::WriteData( const void *data, void *dest ) const
-{
- memcpy( dest, data, GetSize() );
-}
projects / wxWidgets.git / blobdiff