projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed no longer used src/iodbc directory
[wxWidgets.git]
/
src
/
gtk
/
dataobj.cpp
diff --git
a/src/gtk/dataobj.cpp
b/src/gtk/dataobj.cpp
index 8ed810899780af1660a6f7c78420cedaf4dfe5fc..6ea3dc4f2f1d22f67b9a7ddf5ded82a32ff8957c 100644
(file)
--- a/
src/gtk/dataobj.cpp
+++ b/
src/gtk/dataobj.cpp
@@
-17,13
+17,13
@@
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/app.h"
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/app.h"
+ #include "wx/image.h"
#endif
#include "wx/mstream.h"
#endif
#include "wx/mstream.h"
-#include "wx/image.h"
#include "wx/uri.h"
#include "wx/uri.h"
-#include
<gdk/gdk.h>
+#include
"wx/gtk/private.h"
//-------------------------------------------------------------------------
// global data
//-------------------------------------------------------------------------
// global data
@@
-58,13
+58,7
@@
wxDataFormat::wxDataFormat( wxDataFormatId type )
SetType( type );
}
SetType( type );
}
-wxDataFormat::wxDataFormat( const wxChar *id )
-{
- PrepareFormats();
- SetId( id );
-}
-
-wxDataFormat::wxDataFormat( const wxString &id )
+void wxDataFormat::InitFromString( const wxString &id )
{
PrepareFormats();
SetId( id );
{
PrepareFormats();
SetId( id );
@@
-110,10
+104,8
@@
wxDataFormatId wxDataFormat::GetType() const
wxString wxDataFormat::GetId() const
{
wxString wxDataFormat::GetId() const
{
- gchar* atom_name = gdk_atom_name( m_format );
- wxString ret = wxString::FromAscii( atom_name );
- g_free(atom_name);
- return ret;
+ wxGtkString atom_name(gdk_atom_name(m_format));
+ return wxString::FromAscii(atom_name);
}
void wxDataFormat::SetId( NativeFormat format )
}
void wxDataFormat::SetId( NativeFormat format )
@@
-140,12
+132,11
@@
void wxDataFormat::SetId( NativeFormat format )
m_type = wxDF_PRIVATE;
}
m_type = wxDF_PRIVATE;
}
-void wxDataFormat::SetId( const wx
Char *
id )
+void wxDataFormat::SetId( const wx
String&
id )
{
PrepareFormats();
m_type = wxDF_PRIVATE;
{
PrepareFormats();
m_type = wxDF_PRIVATE;
- wxString tmp( id );
- m_format = gdk_atom_intern( (const char*) tmp.ToAscii(), FALSE );
+ m_format = gdk_atom_intern( id.ToAscii(), FALSE );
}
void wxDataFormat::PrepareFormats()
}
void wxDataFormat::PrepareFormats()
@@
-213,13
+204,17
@@
bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir)
// wxTextDataObject
// ----------------------------------------------------------------------------
// wxTextDataObject
// ----------------------------------------------------------------------------
-#if defined(__WXGTK20__) && wxUSE_UNICODE
-void wxTextDataObject::GetAllFormats(wxDataFormat *formats, wxDataObjectBase::Direction dir) const
+#if wxUSE_UNICODE
+
+void
+wxTextDataObject::GetAllFormats(wxDataFormat *formats,
+ wxDataObjectBase::Direction WXUNUSED(dir)) const
{
*formats++ = GetPreferredFormat();
*formats = g_altTextAtom;
}
{
*formats++ = GetPreferredFormat();
*formats = g_altTextAtom;
}
-#endif
+
+#endif // wxUSE_UNICODE
// ----------------------------------------------------------------------------
// wxFileDataObject
// ----------------------------------------------------------------------------
// wxFileDataObject
@@
-236,7
+231,7
@@
bool wxFileDataObject::GetDataHere(void *buf) const
filenames += wxT("\r\n");
}
filenames += wxT("\r\n");
}
- memcpy( buf, filenames.mbc_str(), filenames.
Len
() + 1 );
+ memcpy( buf, filenames.mbc_str(), filenames.
length
() + 1 );
return true;
}
return true;
}
@@
-248,7
+243,7
@@
size_t wxFileDataObject::GetDataSize() const
for (size_t i = 0; i < m_filenames.GetCount(); i++)
{
// This is junk in UTF-8
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].
length
();
res += 5 + 2; // "file:" (5) + "\r\n" (2)
}
res += 5 + 2; // "file:" (5) + "\r\n" (2)
}
@@
-257,48
+252,56
@@
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)
{
+ // we get data in the text/uri-list format, i.e. as a sequence of URIs
+ // (filenames prefixed by "file:") delimited by "\r\n". size includes
+ // the trailing zero (in theory, not for Nautilus in early GNOME
+ // versions).
+
m_filenames.Empty();
m_filenames.Empty();
- // 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++ )
+ const gchar *nexttemp = (const gchar*) buf;
+ for ( ; ; )
{
{
- // 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 )
+ int len = 0;
+ const gchar *temp = nexttemp;
+ for (;;)
{
{
- size_t lenPrefix = 5; // strlen("file:")
- if ( filename.Left(lenPrefix).MakeLower() == _T("file:") )
+ if (temp[len] == 0)
{
{
- // 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 (len > 0)
{
{
- // skip the slashes
- lenPrefix += 2;
+ // if an app omits '\r''\n'
+ nexttemp = temp+len;
+ break;
}
}
-
- AddFile(wxURI::Unescape(filename.c_str() + lenPrefix));
- filename.Empty();
+
+ return true;
}
}
-
else if ( !filename.empty()
)
+
if (temp[len] == '\r'
)
{
{
- wxLogDebug(_T("Unsupported URI \"%s\" in wxFileDataObject"),
- filename.c_str());
- }
-
- if ( !*p )
+ if (temp[len+1] == '\n')
+ nexttemp = temp+len+2;
+ else
+ nexttemp = temp+len+1;
break;
break;
-
- // skip '\r'
- p++;
+ }
+ len++;
}
}
- else
+
+ if (len == 0)
+ break;
+
+ // required to give it a trailing zero
+ gchar *uri = g_strndup( temp, len );
+
+ gchar *fn = g_filename_from_uri( uri, NULL, NULL );
+
+ g_free( uri );
+
+ if (fn)
{
{
- filename += *p;
+ AddFile( wxConvFileName->cMB2WX( fn ) );
+ g_free( fn );
}
}
}
}