X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkselection.c;h=8ea2a3c93ae3c877215a365b4337b4aafc81b402;hb=4dc4227c70a49e67c930e0ebaeab74e3d28f004b;hp=8c0398e7c242a12c5455bf2170cf96ebb0dbe444;hpb=016d891708aac2c3f6e135ec15e0962a7d6c6442;p=~andy%2Fgtk diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c index 8c0398e7c..8ea2a3c93 100644 --- a/gtk/gtkselection.c +++ b/gtk/gtkselection.c @@ -51,7 +51,7 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ -#include +#include "config.h" #include #include #include "gdk.h" @@ -1008,7 +1008,7 @@ gtk_selection_remove_all (GtkWidget *widget) In emergency, you could use #GDK_CURRENT_TIME * * Requests the contents of a selection. When received, - * a "selection_received" signal will be generated. + * a "selection-received" signal will be generated. * * Return value: %TRUE if requested succeeded. %FALSE if we could not process * request. (e.g., there was already a request in process for @@ -1067,6 +1067,7 @@ gtk_selection_convert (GtkWidget *widget, if (owner_window != NULL) { GtkWidget *owner_widget; + gpointer owner_widget_ptr; GtkSelectionData selection_data; selection_data.selection = selection; @@ -1075,7 +1076,8 @@ gtk_selection_convert (GtkWidget *widget, selection_data.length = -1; selection_data.display = display; - gdk_window_get_user_data (owner_window, (gpointer *)&owner_widget); + gdk_window_get_user_data (owner_window, &owner_widget_ptr); + owner_widget = owner_widget_ptr; if (owner_widget != NULL) { @@ -1109,13 +1111,33 @@ gtk_selection_convert (GtkWidget *widget, return TRUE; } +/** + * gtk_selection_data_get_selection: + * @selection_data: a pointer to a #GtkSelectionData structure. + * + * Retrieves the selection #GdkAtom of the selection data. + * + * Returns: the selection #GdkAtom of the selection data. + * + * Since: 2.16 + **/ +GdkAtom +gtk_selection_data_get_selection (GtkSelectionData *selection_data) +{ + g_return_val_if_fail (selection_data != NULL, 0); + + return selection_data->selection; +} + /** * gtk_selection_data_get_target: * @selection_data: a pointer to a #GtkSelectionData structure. * * Retrieves the target of the selection. * - * Since: GSEAL-branch + * Returns: the target of the selection. + * + * Since: 2.14 **/ GdkAtom gtk_selection_data_get_target (GtkSelectionData *selection_data) @@ -1131,7 +1153,9 @@ gtk_selection_data_get_target (GtkSelectionData *selection_data) * * Retrieves the data type of the selection. * - * Since: GSEAL-branch + * Returns: the data type of the selection. + * + * Since: 2.14 **/ GdkAtom gtk_selection_data_get_data_type (GtkSelectionData *selection_data) @@ -1147,7 +1171,9 @@ gtk_selection_data_get_data_type (GtkSelectionData *selection_data) * * Retrieves the format of the selection. * - * Since: GSEAL-branch + * Returns: the format of the selection. + * + * Since: 2.14 **/ gint gtk_selection_data_get_format (GtkSelectionData *selection_data) @@ -1160,33 +1186,48 @@ gtk_selection_data_get_format (GtkSelectionData *selection_data) /** * gtk_selection_data_get_data: * @selection_data: a pointer to a #GtkSelectionData structure. - * @length: an integer to be filled in, or %NULL * * Retrieves the raw data of the selection. * - * If @length is not %NULL it is filled with the length of data. + * Returns: the raw data of the selection. * - * Since: GSEAL-branch + * Since: 2.14 **/ const guchar* -gtk_selection_data_get_data (GtkSelectionData *selection_data, - guint *length) +gtk_selection_data_get_data (GtkSelectionData *selection_data) { g_return_val_if_fail (selection_data != NULL, NULL); - if (length) - *length = selection_data->length; - return selection_data->data; } +/** + * gtk_selection_data_get_length: + * @selection_data: a pointer to a #GtkSelectionData structure. + * + * Retrieves the length of the raw data of the selection. + * + * Returns: the length of the data of the selection. + * + * Since: 2.14 + */ +gint +gtk_selection_data_get_length (GtkSelectionData *selection_data) +{ + g_return_val_if_fail (selection_data != NULL, -1); + + return selection_data->length; +} + /** * gtk_selection_data_get_display: * @selection_data: a pointer to a #GtkSelectionData structure. * * Retrieves the display of the selection. * - * Since: GSEAL-branch + * Returns: the display of the selection. + * + * Since: 2.14 **/ GdkDisplay * gtk_selection_data_get_display (GtkSelectionData *selection_data) @@ -2623,7 +2664,7 @@ gtk_selection_incr_timeout (GtkIncrInfo *info) /************************************************************* * _gtk_selection_notify: - * Handler for "selection_notify_event" signals on windows + * Handler for "selection-notify-event" signals on windows * where a retrieval is currently in process. The selection * owner has responded to our conversion request. * arguments: @@ -2712,7 +2753,7 @@ _gtk_selection_notify (GtkWidget *widget, /************************************************************* * _gtk_selection_property_notify: - * Handler for "property_notify_event" signals on windows + * Handler for "property-notify-event" signals on windows * where a retrieval is currently in process. The selection * owner has added more data. * arguments: @@ -2867,7 +2908,7 @@ gtk_selection_retrieval_timeout (GtkRetrievalInfo *info) /************************************************************* * gtk_selection_retrieval_report: - * Emits a "selection_received" signal. + * Emits a "selection-received" signal. * arguments: * info: information about the retrieval that completed * buffer: buffer containing data (NULL => errror) @@ -2893,7 +2934,7 @@ gtk_selection_retrieval_report (GtkRetrievalInfo *info, data.display = gtk_widget_get_display (info->widget); g_signal_emit_by_name (info->widget, - "selection_received", + "selection-received", &data, time); } @@ -2928,7 +2969,7 @@ gtk_selection_invoke_handler (GtkWidget *widget, gtk_target_list_find (target_list, data->target, &info)) { g_signal_emit_by_name (widget, - "selection_get", + "selection-get", data, info, time); }