diff --git a/ChangeLog b/ChangeLog index 30dd45875..1b993f6f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-08-07 Christian Hoff + + * gtk/SelectionData.custom: Use gtk_selection_data_get_data instead + of a glue func to acces the data field. + 2009-08-05 Christian Hoff * sample/CustomcellRenderer.cs: Use GObject property registration diff --git a/gtk/SelectionData.custom b/gtk/SelectionData.custom index f3a0aeb4f..c1b9fdc1a 100644 --- a/gtk/SelectionData.custom +++ b/gtk/SelectionData.custom @@ -38,12 +38,12 @@ } } - [DllImport("gtksharpglue-2")] - private static extern IntPtr gtksharp_gtk_selection_data_get_data_pointer (IntPtr selection_data); + [DllImport("libgtk-win32-2.0-0.dll")] + private static extern IntPtr gtk_selection_data_get_data (IntPtr selection_data); public byte[] Data { get { - IntPtr data_ptr = gtksharp_gtk_selection_data_get_data_pointer (Handle); + IntPtr data_ptr = gtk_selection_data_get_data (Handle); byte[] result = new byte [Length]; Marshal.Copy (data_ptr, result, 0, Length); return result; diff --git a/gtk/glue/Makefile.am b/gtk/glue/Makefile.am index 4157b818e..c10a37dc4 100644 --- a/gtk/glue/Makefile.am +++ b/gtk/glue/Makefile.am @@ -5,7 +5,6 @@ libgtksharpglue_2_la_SOURCES = \ clipboard.c \ container.c \ object.c \ - selectiondata.c \ statusicon.c \ style.c \ vmglueheaders.h \ diff --git a/gtk/glue/selectiondata.c b/gtk/glue/selectiondata.c deleted file mode 100644 index a68986d39..000000000 --- a/gtk/glue/selectiondata.c +++ /dev/null @@ -1,30 +0,0 @@ -/* selectiondata.c : Glue to access fields of GtkSelectionData - * - * Author: Mike Kestner - * - * Copyright (c) 2003 Novell, Inc. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the Lesser GNU General - * Public License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include - -guchar *gtksharp_gtk_selection_data_get_data_pointer (GtkSelectionData *data); - -guchar * -gtksharp_gtk_selection_data_get_data_pointer (GtkSelectionData *data) -{ - return data->data; -}