[gtk/dnd-gestures-2: 7/14] Update all callers
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/dnd-gestures-2: 7/14] Update all callers
- Date: Wed, 8 Jan 2020 21:37:22 +0000 (UTC)
commit 89495d647f8131cbdbce3ee2865216d903735ed7
Author: Matthias Clasen <mclasen redhat com>
Date: Tue Jan 7 23:31:48 2020 -0500
Update all callers
demos/gtk-demo/clipboard.c | 5 +----
gtk/gtkcalendar.c | 8 ++++++--
gtk/gtkcolorbutton.c | 3 +--
gtk/gtkcolorswatch.c | 3 +--
gtk/gtkexpander.c | 4 ++++
gtk/gtkfilechooserbutton.c | 4 ++--
gtk/gtkfilechooserwidget.c | 2 ++
gtk/gtkiconview.c | 8 ++++++--
gtk/gtknotebook.c | 6 ++++--
gtk/gtkplacessidebar.c | 5 +++--
gtk/gtkstackswitcher.c | 4 ++++
gtk/gtktext.c | 10 +++++++---
gtk/gtktextview.c | 8 ++++++--
gtk/gtktreeview.c | 8 ++++++--
tests/testdnd.c | 1 +
tests/testdnd2.c | 2 +-
tests/testlist3.c | 1 +
tests/testnotebookdnd.c | 3 +--
tests/testtoolbar.c | 4 +++-
tests/testtreednd.c | 1 +
20 files changed, 61 insertions(+), 29 deletions(-)
---
diff --git a/demos/gtk-demo/clipboard.c b/demos/gtk-demo/clipboard.c
index 5cad0626de..c8e5323bab 100644
--- a/demos/gtk-demo/clipboard.c
+++ b/demos/gtk-demo/clipboard.c
@@ -177,14 +177,11 @@ got_texture (GObject *source,
static gboolean
drag_drop (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y,
GtkWidget *widget)
{
- GdkDrop *drop;
-
- drop = gtk_drop_target_get_drop (dest);
-
if (gdk_drop_has_value (drop, GDK_TYPE_TEXTURE))
{
gdk_drop_read_value_async (drop, GDK_TYPE_TEXTURE, G_PRIORITY_DEFAULT, NULL, got_texture, widget);
diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index c1dc03e6e8..703692bc2d 100644
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -332,12 +332,15 @@ static gboolean gtk_calendar_query_tooltip (GtkWidget *widget,
GtkTooltip *tooltip);
static gboolean gtk_calendar_drag_motion (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y,
GtkCalendar *calendar);
static void gtk_calendar_drag_leave (GtkDropTarget *dest,
+ GdkDrop *drop,
GtkCalendar *calendar);
static gboolean gtk_calendar_drag_drop (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y,
GtkCalendar *calendar);
@@ -2971,6 +2974,7 @@ get_status_pending (GdkDrop *drop)
static void
gtk_calendar_drag_leave (GtkDropTarget *dest,
+ GdkDrop *drop,
GtkCalendar *calendar)
{
}
@@ -3043,11 +3047,11 @@ got_text (GObject *source,
static gboolean
gtk_calendar_drag_motion (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y,
GtkCalendar *calendar)
{
- GdkDrop *drop = gtk_drop_target_get_drop (dest);
GdkAtom target;
target = gtk_drop_target_find_mimetype (dest);
@@ -3064,11 +3068,11 @@ gtk_calendar_drag_motion (GtkDropTarget *dest,
static gboolean
gtk_calendar_drag_drop (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y,
GtkCalendar *calendar)
{
- GdkDrop *drop = gtk_drop_target_get_drop (dest);
GdkAtom target;
target = gtk_drop_target_find_mimetype (dest);
diff --git a/gtk/gtkcolorbutton.c b/gtk/gtkcolorbutton.c
index 5df2fad3df..9369e350c0 100644
--- a/gtk/gtkcolorbutton.c
+++ b/gtk/gtkcolorbutton.c
@@ -252,12 +252,11 @@ got_color (GObject *source,
static gboolean
gtk_color_button_drag_drop (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y,
GtkColorButton *button)
{
- GdkDrop *drop = gtk_drop_target_get_drop (dest);
-
if (gdk_drop_has_value (drop, GDK_TYPE_RGBA))
{
gdk_drop_read_value_async (drop, GDK_TYPE_RGBA, G_PRIORITY_DEFAULT, NULL, got_color, button);
diff --git a/gtk/gtkcolorswatch.c b/gtk/gtkcolorswatch.c
index 96b6ea3447..af7dcbd6b5 100644
--- a/gtk/gtkcolorswatch.c
+++ b/gtk/gtkcolorswatch.c
@@ -154,12 +154,11 @@ got_color (GObject *source,
static gboolean
swatch_drag_drop (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y,
GtkColorSwatch *swatch)
{
- GdkDrop *drop = gtk_drop_target_get_drop (dest);
-
if (gdk_drop_has_value (drop, GDK_TYPE_RGBA))
{
gdk_drop_read_value_async (drop, GDK_TYPE_RGBA, G_PRIORITY_DEFAULT, NULL, got_color, swatch);
diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c
index ac5b6034ab..ba00716e86 100644
--- a/gtk/gtkexpander.c
+++ b/gtk/gtkexpander.c
@@ -193,10 +193,12 @@ static void gtk_expander_size_allocate (GtkWidget *widget,
static gboolean gtk_expander_focus (GtkWidget *widget,
GtkDirectionType direction);
static gboolean gtk_expander_drag_motion (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y,
GtkExpander *expander);
static void gtk_expander_drag_leave (GtkDropTarget *dest,
+ GdkDrop *drop,
GtkExpander *expander);
static void gtk_expander_add (GtkContainer *container,
@@ -548,6 +550,7 @@ expand_timeout (gpointer data)
static gboolean
gtk_expander_drag_motion (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y,
GtkExpander *expander)
@@ -565,6 +568,7 @@ gtk_expander_drag_motion (GtkDropTarget *dest,
static void
gtk_expander_drag_leave (GtkDropTarget *dest,
+ GdkDrop *drop,
GtkExpander *expander)
{
GtkExpanderPrivate *priv = gtk_expander_get_instance_private (expander);
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index 0ecb93a2b0..00bacca83f 100644
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -268,6 +268,7 @@ static void gtk_file_chooser_button_finalize (GObject *ob
/* GtkWidget Functions */
static void gtk_file_chooser_button_destroy (GtkWidget *widget);
static gboolean gtk_file_chooser_button_drag_drop (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y,
GtkWidget *widget);
@@ -1215,12 +1216,11 @@ got_text (GObject *source,
static gboolean
gtk_file_chooser_button_drag_drop (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y,
GtkWidget *button)
{
- GdkDrop *drop = gtk_drop_target_get_drop (dest);
-
if (gdk_drop_has_value (drop, G_TYPE_FILE))
{
gdk_drop_read_value_async (drop, G_TYPE_FILE, G_PRIORITY_DEFAULT, NULL, got_file, button);
diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index 3d7d5fd199..fbfdc32e82 100644
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -2031,6 +2031,7 @@ file_list_drag_data_received_cb (GObject *source,
/* Don't do anything with the drag_drop signal */
static gboolean
file_list_drag_drop_cb (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y,
GtkFileChooserWidget *impl)
@@ -2046,6 +2047,7 @@ file_list_drag_drop_cb (GtkDropTarget *dest,
dropping the dragged item onto a tree item */
static gboolean
file_list_drag_motion_cb (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y,
GtkFileChooserWidget *impl)
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 7ba475b09e..d997c4cd00 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -290,12 +290,15 @@ static GBytes * gtk_icon_view_drag_data_get (const char *mime_type,
/* Target side drag signals */
static void gtk_icon_view_drag_leave (GtkDropTarget *dest,
+ GdkDrop *drop,
GtkIconView *icon_view);
static gboolean gtk_icon_view_drag_motion (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y,
GtkIconView *icon_view);
static gboolean gtk_icon_view_drag_drop (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y,
GtkIconView *icon_view);
@@ -6165,6 +6168,7 @@ gtk_icon_view_dnd_finished_cb (GdkDrag *drag,
/* Target side drag signals */
static void
gtk_icon_view_drag_leave (GtkDropTarget *dest,
+ GdkDrop *drop,
GtkIconView *icon_view)
{
/* unset any highlight row */
@@ -6177,11 +6181,11 @@ gtk_icon_view_drag_leave (GtkDropTarget *dest,
static gboolean
gtk_icon_view_drag_motion (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y,
GtkIconView *icon_view)
{
- GdkDrop *drop = gtk_drop_target_get_drop (dest);
GtkTreePath *path = NULL;
GtkIconViewDropPosition pos;
GdkDragAction suggested_action = 0;
@@ -6235,11 +6239,11 @@ gtk_icon_view_drag_motion (GtkDropTarget *dest,
static gboolean
gtk_icon_view_drag_drop (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y,
GtkIconView *icon_view)
{
- GdkDrop *drop = gtk_drop_target_get_drop (dest);
GtkTreePath *path;
GdkDragAction suggested_action = 0;
GdkAtom target = NULL;
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 108eee659c..26735ad8e2 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -704,10 +704,12 @@ static void gtk_notebook_drag_cancel_cb (GdkDrag *drag,
GdkDragCancelReason reason,
GtkWidget *widget);
static gboolean gtk_notebook_drag_motion (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y);
static void gtk_notebook_drag_leave (GtkDropTarget *dest);
static gboolean gtk_notebook_drag_drop (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y);
static GBytes * gtk_notebook_drag_data_get (const char *mime_type,
@@ -3188,12 +3190,12 @@ gtk_notebook_switch_tab_timeout (gpointer data)
static gboolean
gtk_notebook_drag_motion (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y)
{
GtkWidget *tabs = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (dest));
GtkWidget *widget = gtk_widget_get_ancestor (tabs, GTK_TYPE_NOTEBOOK);
- GdkDrop *drop = gtk_drop_target_get_drop (dest);
GtkNotebook *notebook = GTK_NOTEBOOK (widget);
GtkNotebookPrivate *priv = notebook->priv;
graphene_rect_t position;
@@ -3331,13 +3333,13 @@ got_page (GObject *source,
static gboolean
gtk_notebook_drag_drop (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y)
{
GtkWidget *tabs = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (dest));
GtkWidget *widget = gtk_widget_get_ancestor (tabs, GTK_TYPE_NOTEBOOK);
GtkNotebook *notebook = GTK_NOTEBOOK (widget);
- GdkDrop *drop = gtk_drop_target_get_drop (dest);
GdkDrag *drag = gdk_drop_get_drag (drop);
GtkWidget *source_widget;
GdkAtom target, tab_target;
diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c
index bf348ade9b..71210ea086 100644
--- a/gtk/gtkplacessidebar.c
+++ b/gtk/gtkplacessidebar.c
@@ -1725,12 +1725,12 @@ create_placeholder_row (GtkPlacesSidebar *sidebar)
static gboolean
drag_motion_callback (GtkDropTarget *dest,
+ GdkDrop *drop,
gint x,
gint y,
gpointer user_data)
{
GtkPlacesSidebar *sidebar = GTK_PLACES_SIDEBAR (user_data);
- GdkDrop *drop = gtk_drop_target_get_drop (dest);
gint action;
GtkListBoxRow *row;
GtkPlacesSidebarPlaceType place_type;
@@ -2084,10 +2084,10 @@ dnd_finished_cb (GdkDrag *drag,
*/
static void
drag_leave_callback (GtkDropTarget *dest,
+ GdkDrop *drop,
gpointer user_data)
{
GtkPlacesSidebar *sidebar = GTK_PLACES_SIDEBAR (user_data);
- GdkDrop *drop = gtk_drop_target_get_drop (dest);
if (sidebar->drop_state != DROP_STATE_NEW_BOOKMARK_ARMED_PERMANENT)
{
@@ -2103,6 +2103,7 @@ drag_leave_callback (GtkDropTarget *dest,
static gboolean
drag_drop_callback (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y,
gpointer user_data)
diff --git a/gtk/gtkstackswitcher.c b/gtk/gtkstackswitcher.c
index 02d22dec08..d1391626d6 100644
--- a/gtk/gtkstackswitcher.c
+++ b/gtk/gtkstackswitcher.c
@@ -93,8 +93,10 @@ enum {
};
static void gtk_stack_switcher_drag_leave (GtkDropTarget *dest,
+ GdkDrop *drop,
GtkStackSwitcher *self);
static gboolean gtk_stack_switcher_drag_motion (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y,
GtkStackSwitcher *self);
@@ -263,6 +265,7 @@ gtk_stack_switcher_switch_timeout (gpointer data)
static gboolean
gtk_stack_switcher_drag_motion (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y,
GtkStackSwitcher *self)
@@ -305,6 +308,7 @@ gtk_stack_switcher_drag_motion (GtkDropTarget *dest,
static void
gtk_stack_switcher_drag_leave (GtkDropTarget *dest,
+ GdkDrop *drop,
GtkStackSwitcher *self)
{
remove_switch_timer (self);
diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index 0da58dd715..055beb76e9 100644
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -335,14 +335,17 @@ static void gtk_text_state_flags_changed (GtkWidget *widget,
static void gtk_text_root (GtkWidget *widget);
static gboolean gtk_text_drag_drop (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y,
GtkText *text);
static gboolean gtk_text_drag_motion (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y,
GtkText *text);
-static void gtk_text_drag_leave (GtkDropTarget *dest,
+static void gtk_text_drag_leave (GtkDropTarget *dest,
+ GdkDrop *drop,
GtkText *text);
@@ -6124,6 +6127,7 @@ gtk_text_selection_bubble_popup_set (GtkText *self)
static void
gtk_text_drag_leave (GtkDropTarget *dest,
+ GdkDrop *drop,
GtkText *self)
{
GtkTextPrivate *priv = gtk_text_get_instance_private (self);
@@ -6207,12 +6211,12 @@ got_text (GObject *source,
static gboolean
gtk_text_drag_drop (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y,
GtkText *self)
{
GtkTextPrivate *priv = gtk_text_get_instance_private (self);
- GdkDrop *drop = gtk_drop_target_get_drop (dest);
if (priv->editable && gdk_drop_has_value (drop, G_TYPE_STRING))
{
@@ -6227,12 +6231,12 @@ gtk_text_drag_drop (GtkDropTarget *dest,
static gboolean
gtk_text_drag_motion (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y,
GtkText *self)
{
GtkTextPrivate *priv = gtk_text_get_instance_private (self);
- GdkDrop *drop = gtk_drop_target_get_drop (dest);
GtkWidget *widget = GTK_WIDGET (self);
GdkDragAction suggested_action;
int new_position, old_position;
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 1013c734d8..ed5f6ad90d 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -421,12 +421,15 @@ static GtkTextBuffer* gtk_text_view_create_buffer (GtkTextView *text_view);
/* Target side drag signals */
static void gtk_text_view_drag_leave (GtkDropTarget *dest,
+ GdkDrop *drop,
GtkTextView *text_view);
static gboolean gtk_text_view_drag_motion (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y,
GtkTextView *text_view);
static gboolean gtk_text_view_drag_drop (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y,
GtkTextView *text_view);
@@ -7722,6 +7725,7 @@ gtk_text_view_start_selection_dnd (GtkTextView *text_view,
static void
gtk_text_view_drag_leave (GtkDropTarget *dest,
+ GdkDrop *drop,
GtkTextView *text_view)
{
GtkTextViewPrivate *priv = text_view->priv;
@@ -7738,12 +7742,12 @@ gtk_text_view_drag_leave (GtkDropTarget *dest,
static gboolean
gtk_text_view_drag_motion (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y,
GtkTextView *text_view)
{
GtkTextViewPrivate *priv = text_view->priv;
- GdkDrop *drop = gtk_drop_target_get_drop (dest);
GtkTextIter newplace;
GtkTextIter start;
GtkTextIter end;
@@ -7882,12 +7886,12 @@ got_text (GObject *source,
static gboolean
gtk_text_view_drag_drop (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y,
GtkTextView *text_view)
{
GtkTextViewPrivate *priv = text_view->priv;
- GdkDrop *drop = gtk_drop_target_get_drop (dest);
GtkTextIter drop_point;
GtkTextBuffer *buffer = NULL;
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 3deb0bf4c5..d53ed0f2fe 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -693,12 +693,15 @@ static GBytes *gtk_tree_view_drag_data_get (const char *mimetype,
/* Target side drag signals */
static void gtk_tree_view_drag_leave (GtkDropTarget *dest,
+ GdkDrop *drop,
GtkTreeView *tree_view);
static gboolean gtk_tree_view_drag_motion (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y,
GtkTreeView *tree_view);
static gboolean gtk_tree_view_drag_drop (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y,
GtkTreeView *tree_view);
@@ -7225,6 +7228,7 @@ gtk_tree_view_drag_data_get (const char *mime_type,
static void
gtk_tree_view_drag_leave (GtkDropTarget *dest,
+ GdkDrop *drop,
GtkTreeView *tree_view)
{
/* unset any highlight row */
@@ -7242,11 +7246,11 @@ gtk_tree_view_drag_leave (GtkDropTarget *dest,
static gboolean
gtk_tree_view_drag_motion (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y,
GtkTreeView *tree_view)
{
- GdkDrop *drop = gtk_drop_target_get_drop (dest);
gboolean empty;
GtkTreePath *path = NULL;
GtkTreeViewDropPosition pos;
@@ -7308,11 +7312,11 @@ gtk_tree_view_drag_motion (GtkDropTarget *dest,
static gboolean
gtk_tree_view_drag_drop (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y,
GtkTreeView *tree_view)
{
- GdkDrop *drop = gtk_drop_target_get_drop (dest);
GtkTreePath *path;
GdkDragAction suggested_action = 0;
GdkAtom target = NULL;
diff --git a/tests/testdnd.c b/tests/testdnd.c
index e2d62953b7..d267c70866 100644
--- a/tests/testdnd.c
+++ b/tests/testdnd.c
@@ -441,6 +441,7 @@ popdown_cb (gpointer data)
gboolean
popup_motion (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y)
{
diff --git a/tests/testdnd2.c b/tests/testdnd2.c
index 53c779bf94..a3b2917b8a 100644
--- a/tests/testdnd2.c
+++ b/tests/testdnd2.c
@@ -162,12 +162,12 @@ ask_actions (GdkDrop *drop,
static gboolean
image_drag_drop (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y,
gpointer data)
{
GtkWidget *image = data;
- GdkDrop *drop = gtk_drop_target_get_drop (dest);
GdkDragAction action = gdk_drop_get_actions (drop);
g_object_set_data_full (G_OBJECT (image), "drop", g_object_ref (drop), g_object_unref);
diff --git a/tests/testlist3.c b/tests/testlist3.c
index 45076a73ed..59120cc6bb 100644
--- a/tests/testlist3.c
+++ b/tests/testlist3.c
@@ -55,6 +55,7 @@ got_row (GObject *src,
static void
drag_drop (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y,
gpointer data)
diff --git a/tests/testnotebookdnd.c b/tests/testnotebookdnd.c
index 1f95172137..fe99dfc21d 100644
--- a/tests/testnotebookdnd.c
+++ b/tests/testnotebookdnd.c
@@ -136,10 +136,9 @@ got_page (GObject *source,
static gboolean
on_button_drag_drop (GtkDropTarget *dest,
+ GdkDrop *drop,
gpointer user_data)
{
- GdkDrop *drop = gtk_drop_target_get_drop (dest);
-
gdk_drop_read_async (drop, (const char *[]) { "GTK_NOTEBOOK_TAB", NULL }, G_PRIORITY_DEFAULT, NULL,
got_page, NULL);
gdk_drop_finish (drop, GDK_ACTION_MOVE);
diff --git a/tests/testtoolbar.c b/tests/testtoolbar.c
index 2a9ab3afb3..458ca2e21c 100644
--- a/tests/testtoolbar.c
+++ b/tests/testtoolbar.c
@@ -294,6 +294,7 @@ bold_toggled (GtkToggleToolButton *button)
static gboolean
toolbar_drag_drop (GtkDropTarget *dest,
+ GdkDrop *drop,
gint x, gint y,
GtkWidget *label)
{
@@ -324,11 +325,11 @@ static GtkToolItem *drag_item = NULL;
static gboolean
toolbar_drag_motion (GtkDropTarget *dest,
+ GdkDrop *drop,
gint x,
gint y,
GtkToolbar *toolbar)
{
- GdkDrop *drop = gtk_drop_target_get_drop (dest);
gint index;
if (!drag_item)
@@ -348,6 +349,7 @@ toolbar_drag_motion (GtkDropTarget *dest,
static void
toolbar_drag_leave (GtkDropTarget *dest,
+ GdkDrop *drop,
GtkToolbar *toolbar)
{
if (drag_item)
diff --git a/tests/testtreednd.c b/tests/testtreednd.c
index 47272c116c..306e87ad45 100644
--- a/tests/testtreednd.c
+++ b/tests/testtreednd.c
@@ -109,6 +109,7 @@ got_text (GObject *source,
static void
drag_drop (GtkDropTarget *dest,
+ GdkDrop *drop,
int x,
int y,
gpointer dada)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
