AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

widget: Remove time argument from drag_data_get() vfunc

Browse Source
This commit is contained in:
Benjamin Otte 2018-06-16 04:49:47 +02:00
parent a2839d157f
commit 9a91d3739d
22 changed files with 20 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
demos/gtk-demo/clipboard.c
View File

@ -138,7 +138,6 @@ drag_data_get (GtkWidget *widget,
GdkDragContext *context,
GtkSelectionData *selection_data,
guint info,
guint time,
gpointer data)
{
GdkPaintable *paintable;

2
demos/icon-browser/iconbrowserwin.c
View File

@ -379,7 +379,6 @@ get_image_data (GtkWidget *widget,
GdkDragContext *context,
GtkSelectionData *selection,
guint target_info,
guint time,
gpointer data)
{
GtkWidget *image;
@ -402,7 +401,6 @@ get_scalable_image_data (GtkWidget *widget,
GdkDragContext *context,
GtkSelectionData *selection,
guint target_info,
guint time,
gpointer data)
{
gchar *uris[2];

6
gtk/gtkcalendar.c
View File

@ -309,8 +309,7 @@ static gboolean gtk_calendar_query_tooltip (GtkWidget *widget,
static void gtk_calendar_drag_data_get (GtkWidget *widget,
GdkDragContext *context,
GtkSelectionData *selection_data,
guint time);
GtkSelectionData *selection_data);
static void gtk_calendar_drag_data_received (GtkWidget *widget,
GdkDrop *drop,
GtkSelectionData *selection_data);
@ -2902,8 +2901,7 @@ gtk_calendar_grab_notify (GtkWidget *widget,
static void
gtk_calendar_drag_data_get (GtkWidget *widget,
GdkDragContext *context,
GtkSelectionData *selection_data,
guint time)
GtkSelectionData *selection_data)
{
GtkCalendar *calendar = GTK_CALENDAR (widget);
GtkCalendarPrivate *priv = calendar->priv;

2
gtk/gtkcolorbutton.c
View File

@ -115,7 +115,6 @@ static void gtk_color_button_drag_begin (GtkWidget *widget,
static void gtk_color_button_drag_data_get (GtkWidget *widget,
GdkDragContext *context,
GtkSelectionData *selection_data,
guint time,
GtkColorButton *button);
/* target side drag signals */
@ -344,7 +343,6 @@ static void
gtk_color_button_drag_data_get (GtkWidget *widget,
GdkDragContext *context,
GtkSelectionData *selection_data,
guint time,
GtkColorButton *button)
{
GtkColorButtonPrivate *priv = gtk_color_button_get_instance_private (button);

3
gtk/gtkcolorswatch.c
View File

@ -187,8 +187,7 @@ swatch_drag_begin (GtkWidget *widget,
static void
swatch_drag_data_get (GtkWidget *widget,
GdkDragContext *context,
GtkSelectionData *selection_data,
guint time)
GtkSelectionData *selection_data)
{
GtkColorSwatch *swatch = GTK_COLOR_SWATCH (widget);
guint16 vals[4];

10
gtk/gtkdnd.c
View File

@ -268,9 +268,6 @@ gtk_drag_get_data_got_stream (GObject *source,
* #GtkWidget::drag-data-received signal
* @drop: the #GdkDrop
* @target: the target (form of the data) to retrieve
* @time_: a timestamp for retrieving the data. This will
* generally be the time received in a #GtkWidget::drag-motion
* or #GtkWidget::drag-drop signal
*
* Gets the data associated with a drag. When the data
* is received or the retrieval fails, GTK+ will emit a
@ -812,8 +809,7 @@ gtk_drag_content_write_mime_type_async (GdkContentProvider *provider,
g_signal_emit_by_name (content->widget, "drag-data-get",
content->context,
&sdata,
content->time);
&sdata);
if (sdata.length == -1)
{
@ -890,9 +886,6 @@ gtk_drag_begin_internal (GtkWidget *widget,
GdkDragContext *context;
int dx, dy;
GtkDragContent *content;
guint32 time;
time = gtk_get_current_event_time ();
if (gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD)
device = gdk_device_get_associated_device (device);
@ -910,7 +903,6 @@ gtk_drag_begin_internal (GtkWidget *widget,
content = g_object_new (GTK_TYPE_DRAG_CONTENT, NULL);
content->widget = g_object_ref (widget);
content->formats = gdk_content_formats_ref (target_list);
content->time = time;
context = gdk_drag_begin (gtk_widget_get_surface (toplevel), device, GDK_CONTENT_PROVIDER (content), actions, dx, dy);
if (context == NULL)

6
gtk/gtkentry.c
View File

@ -451,8 +451,7 @@ static void gtk_entry_drag_data_received (GtkWidget *widget,
GtkSelectionData *selection_data);
static void gtk_entry_drag_data_get (GtkWidget *widget,
GdkDragContext *context,
GtkSelectionData *selection_data,
guint time);
GtkSelectionData *selection_data);
static void gtk_entry_drag_data_delete (GtkWidget *widget,
GdkDragContext *context);
static void gtk_entry_drag_begin (GtkWidget *widget,
@ -8748,8 +8747,7 @@ gtk_entry_drag_data_received (GtkWidget *widget,
static void
gtk_entry_drag_data_get (GtkWidget *widget,
GdkDragContext *context,
GtkSelectionData *selection_data,
guint time)
GtkSelectionData *selection_data)
{
GtkEntry *entry = GTK_ENTRY (widget);
GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry);

6
gtk/gtkiconview.c
View File

@ -282,8 +282,7 @@ static void gtk_icon_view_drag_end (GtkWidget *widget,
GdkDragContext *context);
static void gtk_icon_view_drag_data_get (GtkWidget *widget,
GdkDragContext *context,
GtkSelectionData *selection_data,
guint time);
GtkSelectionData *selection_data);
static void gtk_icon_view_drag_data_delete (GtkWidget *widget,
GdkDragContext *context);
@ -6128,8 +6127,7 @@ gtk_icon_view_drag_end (GtkWidget *widget,
static void
gtk_icon_view_drag_data_get (GtkWidget *widget,
GdkDragContext *context,
GtkSelectionData *selection_data,
guint time)
GtkSelectionData *selection_data)
{
GtkIconView *icon_view;
GtkTreeModel *model;

6
gtk/gtklabel.c
View File

@ -477,8 +477,7 @@ static void gtk_label_setup_mnemonic (GtkLabel *label,
guint last_key);
static void gtk_label_drag_data_get (GtkWidget *widget,
GdkDragContext *context,
GtkSelectionData *selection_data,
guint time);
GtkSelectionData *selection_data);
static void gtk_label_buildable_interface_init (GtkBuildableIface *iface);
static gboolean gtk_label_buildable_custom_tag_start (GtkBuildable *buildable,
@ -5171,8 +5170,7 @@ gtk_label_set_selection_text (GtkLabel *label,
static void
gtk_label_drag_data_get (GtkWidget *widget,
GdkDragContext *context,
GtkSelectionData *selection_data,
guint time)
GtkSelectionData *selection_data)
{
gtk_label_set_selection_text (GTK_LABEL (widget), selection_data);
}

2
gtk/gtklinkbutton.c
View File

@ -109,7 +109,6 @@ static gboolean gtk_link_button_popup_menu (GtkWidget *widget);
static void gtk_link_button_drag_data_get_cb (GtkWidget *widget,
GdkDragContext *context,
GtkSelectionData *selection,
guint _time,
gpointer user_data);
static gboolean gtk_link_button_query_tooltip_cb (GtkWidget *widget,
gint x,
@ -436,7 +435,6 @@ static void
gtk_link_button_drag_data_get_cb (GtkWidget *widget,
GdkDragContext *context,
GtkSelectionData *selection,
guint _time,
gpointer user_data)
{
GtkLinkButton *link_button = GTK_LINK_BUTTON (widget);

1
gtk/gtkmarshalers.list
View File

@ -75,7 +75,6 @@ VOID:INT,INT,INT
VOID:OBJECT,BOOLEAN
VOID:OBJECT,BOXED
VOID:OBJECT,BOXED,BOXED
VOID:OBJECT,BOXED,UINT
VOID:OBJECT,BOXED,BOOLEAN,BOOLEAN
VOID:OBJECT,ENUM
VOID:OBJECT,FLAGS

6
gtk/gtknotebook.c
View File

@ -403,8 +403,7 @@ static gboolean gtk_notebook_drag_drop (GtkWidget *widget,
gint y);
static void gtk_notebook_drag_data_get (GtkWidget *widget,
GdkDragContext *context,
GtkSelectionData *data,
guint time);
GtkSelectionData *data);
static void gtk_notebook_drag_data_received (GtkWidget *widget,
GdkDrop *drop,
GtkSelectionData *data);
@ -3215,8 +3214,7 @@ do_detach_tab (GtkNotebook *from,
static void
gtk_notebook_drag_data_get (GtkWidget *widget,
GdkDragContext *context,
GtkSelectionData *data,
guint time)
GtkSelectionData *data)
{
GtkNotebook *notebook = GTK_NOTEBOOK (widget);
GtkNotebookPrivate *priv = notebook->priv;

1
gtk/gtkpathbar.c
View File

@ -1288,7 +1288,6 @@ static void
button_drag_data_get_cb (GtkWidget *widget,
GdkDragContext *context,
GtkSelectionData *selection_data,
guint time_,
gpointer data)
{
ButtonData *button_data;

6
gtk/gtktextview.c
View File

@ -422,8 +422,7 @@ static void gtk_text_view_drag_end (GtkWidget *widget,
GdkDragContext *context);
static void gtk_text_view_drag_data_get (GtkWidget *widget,
GdkDragContext *context,
GtkSelectionData *selection_data,
guint time);
GtkSelectionData *selection_data);
static void gtk_text_view_drag_data_delete (GtkWidget *widget,
GdkDragContext *context);
@ -7651,8 +7650,7 @@ gtk_text_view_drag_end (GtkWidget *widget,
static void
gtk_text_view_drag_data_get (GtkWidget *widget,
GdkDragContext *context,
GtkSelectionData *selection_data,
guint time)
GtkSelectionData *selection_data)
{
GtkTextView *text_view = GTK_TEXT_VIEW (widget);
GtkTextBuffer *buffer = gtk_text_view_get_buffer (text_view);

6
gtk/gtktreeview.c
View File

@ -623,8 +623,7 @@ static void gtk_tree_view_drag_end (GtkWidget *widget,
GdkDragContext *context);
static void gtk_tree_view_drag_data_get (GtkWidget *widget,
GdkDragContext *context,
GtkSelectionData *selection_data,
guint time);
GtkSelectionData *selection_data);
static void gtk_tree_view_drag_data_delete (GtkWidget *widget,
GdkDragContext *context);
@ -7436,8 +7435,7 @@ gtk_tree_view_drag_end (GtkWidget *widget,
static void
gtk_tree_view_drag_data_get (GtkWidget *widget,
GdkDragContext *context,
GtkSelectionData *selection_data,
guint time)
GtkSelectionData *selection_data)
{
GtkTreeView *tree_view;
GtkTreeModel *model;

8
gtk/gtkwidget.c
View File

@ -1967,7 +1967,6 @@ gtk_widget_class_init (GtkWidgetClass *klass)
* @data: the #GtkSelectionData to be filled with the dragged data
* @info: the info that has been registered with the target in the
* #GtkTargetList
* @time: the timestamp at which the data was requested
*
* The ::drag-data-get signal is emitted on the drag source when the drop
* site requests the data which is dragged. It is the responsibility of
@ -1981,11 +1980,10 @@ gtk_widget_class_init (GtkWidgetClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkWidgetClass, drag_data_get),
NULL, NULL,
_gtk_marshal_VOID__OBJECT_BOXED_UINT,
G_TYPE_NONE, 3,
_gtk_marshal_VOID__OBJECT_BOXED,
G_TYPE_NONE, 2,
GDK_TYPE_DRAG_CONTEXT,
GTK_TYPE_SELECTION_DATA | G_SIGNAL_TYPE_STATIC_SCOPE,
G_TYPE_UINT);
GTK_TYPE_SELECTION_DATA | G_SIGNAL_TYPE_STATIC_SCOPE);
/**
* GtkWidget::drag-data-received:

3
gtk/gtkwidget.h
View File

@ -299,8 +299,7 @@ struct _GtkWidgetClass
GdkDragContext *context);
void (* drag_data_get) (GtkWidget *widget,
GdkDragContext *context,
GtkSelectionData *selection_data,
guint time_);
GtkSelectionData *selection_data);
void (* drag_data_delete) (GtkWidget *widget,
GdkDragContext *context);

1
tests/testdnd.c
View File

@ -420,7 +420,6 @@ void
source_drag_data_get (GtkWidget *widget,
GdkDragContext *context,
GtkSelectionData *selection_data,
guint time,
gpointer data)
{
if (gtk_selection_data_get_target (selection_data) == g_intern_static_string ("application/x-rootwindow-drop"))

2
tests/testdnd2.c
View File

@ -155,7 +155,6 @@ void
image_drag_data_get (GtkWidget *widget,
GdkDragContext *context,
GtkSelectionData *selection_data,
guint time,
gpointer data)
{
GdkPaintable *paintable;
@ -312,7 +311,6 @@ void
spinner_drag_data_get (GtkWidget *widget,
GdkDragContext *context,
GtkSelectionData *selection_data,
guint time,
gpointer data)
{
g_print ("GtkWidget::drag-data-get\n");

1
tests/testentryicons.c
View File

@ -24,7 +24,6 @@ static void
drag_data_get_cb (GtkWidget *widget,
GdkDragContext *context,
GtkSelectionData *data,
guint time,
gpointer user_data)
{
gint pos;

1
tests/testimage.c
View File

@ -34,7 +34,6 @@ void
drag_data_get (GtkWidget *widget,
GdkDragContext *context,
GtkSelectionData *selection_data,
guint time,
gpointer data)
{
GtkWidget *image = GTK_WIDGET (data);

1
tests/testlist3.c
View File

@ -29,7 +29,6 @@ void
drag_data_get (GtkWidget *widget,
GdkDragContext *context,
GtkSelectionData *selection_data,
guint time,
gpointer data)
{
gtk_selection_data_set (selection_data,