///////////////////////////////////////////////////////////////////////////////
-// Name: dataobj.cpp
+// Name: src/gtk1/dataobj.cpp
// Purpose: wxDataObject class
// Author: Robert Roebling
// Id: $Id$
// 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/app.h"
-#include "wx/debug.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/log.h"
+ #include "wx/app.h"
+ #include "wx/image.h"
+#endif
+
#include "wx/mstream.h"
-#include "wx/image.h"
+#include "wx/uri.h"
#include <gdk/gdk.h>
//-------------------------------------------------------------------------
GdkAtom g_textAtom = 0;
+GdkAtom g_altTextAtom = 0;
GdkAtom g_pngAtom = 0;
GdkAtom g_fileAtom = 0;
SetType( type );
}
-wxDataFormat::wxDataFormat( const wxChar *id )
-{
- PrepareFormats();
- SetId( id );
-}
-
-wxDataFormat::wxDataFormat( const wxString &id )
+void wxDataFormat::InitFromString( const wxString &id )
{
PrepareFormats();
SetId( id );
void wxDataFormat::SetType( wxDataFormatId type )
{
PrepareFormats();
+
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;
+#endif
else
if (m_type == wxDF_BITMAP)
m_format = g_pngAtom;
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;
}
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_PRIVATE;
}
-void wxDataFormat::SetId( const wxChar *id )
+void wxDataFormat::SetId( const wxString& 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?
+ m_format = gdk_atom_intern( id.ToAscii(), FALSE );
}
void wxDataFormat::PrepareFormats()
// 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 );
if (!g_fileAtom)
{
}
+wxDataObject::~wxDataObject()
+{
+ // dtor is empty but needed for Darwin and AIX -- otherwise it doesn't link
+}
+
bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir) const
{
size_t nFormatCount = GetFormatCount(dir);
- if ( nFormatCount == 1 )
+ if ( nFormatCount == 1 )
{
return format == GetPreferredFormat();
}
- else
+ else
{
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;
for (size_t i = 0; i < m_filenames.GetCount(); i++)
{
+ filenames += wxT("file:");
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.length() + 1 );
- return TRUE;
+ return true;
}
size_t wxFileDataObject::GetDataSize() const
for (size_t i = 0; i < m_filenames.GetCount(); i++)
{
- res += m_filenames[i].Len();
- res += 1;
+ // This is junk in UTF-8
+ res += m_filenames[i].length();
+ res += 5 + 2; // "file:" (5) + "\r\n" (2)
}
return res + 1;
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++ )
{
if ( (*p == '\r' && *(p+1) == '\n') || !*p )
{
size_t lenPrefix = 5; // strlen("file:")
- if ( filename.Left(lenPrefix).MakeLower() == _T("file:") )
+ if ( filename.Left(lenPrefix).MakeLower() == wxT("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('/') )
+ if ( filename[lenPrefix] == wxT('/') &&
+ filename[lenPrefix + 1] == wxT('/') )
{
// skip the slashes
lenPrefix += 2;
}
- AddFile(filename.c_str() + lenPrefix);
+ AddFile(wxURI::Unescape(filename.c_str() + lenPrefix));
filename.Empty();
}
else
{
- wxLogDebug(_T("Unsupported URI '%s' in wxFileDataObject"),
+ wxLogDebug(wxT("Unsupported URI '%s' in wxFileDataObject"),
filename.c_str());
}
filename += *p;
}
}
-#endif // 0/1
- return TRUE;
+ return true;
}
void wxFileDataObject::AddFile( const wxString &filename )
{
wxFAIL_MSG( wxT("attempt to copy empty bitmap failed") );
- return FALSE;
+ return false;
}
memcpy(buf, m_pngData, m_pngSize);
- return TRUE;
+ return true;
}
bool wxBitmapDataObject::SetData(size_t size, const void *buf)
Clear();
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!") );
+ false, wxT("You must call wxImage::AddHandler(new wxPNGHandler); to be able to use clipboard with bitmaps!") );
m_pngSize = size;
m_pngData = malloc(m_pngSize);
wxImage image;
if ( !image.LoadFile( mstream, wxBITMAP_TYPE_PNG ) )
{
- return FALSE;
+ return false;
}
m_bitmap = wxBitmap(image);
wxCHECK_RET( wxImage::FindHandler(wxBITMAP_TYPE_PNG) != NULL,
wxT("You must call wxImage::AddHandler(new wxPNGHandler); to be able to use clipboard with bitmaps!") );
- wxImage image(m_bitmap);
+ wxImage image = m_bitmap.ConvertToImage();
wxCountingOutputStream count;
image.SaveFile(count, wxBITMAP_TYPE_PNG);
image.SaveFile(mstream, wxBITMAP_TYPE_PNG);
}
-
+#endif // wxUSE_DATAOBJ
projects / wxWidgets.git / blobdiff