X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3d257b8db10b5f464d896ff0d4249237d8f587a1..277956850e9abb6488b902c4779c02337b07eb61:/src/gtk1/dataobj.cpp?ds=sidebyside diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp index e8c5f3d622..7fdc0744fb 100644 --- a/src/gtk1/dataobj.cpp +++ b/src/gtk1/dataobj.cpp @@ -108,7 +108,9 @@ wxDataFormatId wxDataFormat::GetType() const wxString wxDataFormat::GetId() const { - wxString ret = wxString::FromAscii( gdk_atom_name( m_format ) ); + gchar* atom_name = gdk_atom_name( m_format ); + wxString ret = wxString::FromAscii( atom_name ); + g_free(atom_name); return ret; } @@ -205,18 +207,6 @@ bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir) } } -// ---------------------------------------------------------------------------- -// wxTextDataObject -// ---------------------------------------------------------------------------- - -#if defined(__WXGTK20__) && wxUSE_UNICODE -void wxTextDataObject::GetAllFormats(wxDataFormat *formats, wxDataObjectBase::Direction dir) const -{ - *formats++ = GetPreferredFormat(); - *formats = g_altTextAtom; -} -#endif - // ---------------------------------------------------------------------------- // wxFileDataObject // ----------------------------------------------------------------------------