From 5dbc6859f8327ed71883c4535bae8d69f3cb0006 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sun, 25 Jun 2023 06:17:14 +0200 Subject: [PATCH] Simplify drag-drop target settings in CTABLES dialog --- src/ui/gui/psppire-dialog-action-ctables.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/src/ui/gui/psppire-dialog-action-ctables.c b/src/ui/gui/psppire-dialog-action-ctables.c index 15cf0ff365..870e0a698b 100644 --- a/src/ui/gui/psppire-dialog-action-ctables.c +++ b/src/ui/gui/psppire-dialog-action-ctables.c @@ -361,7 +361,7 @@ drag_drop_pad (GtkWidget *widget, static gchar f1[]="ctables-dialog"; -static const GtkTargetEntry te[1] = { +static const GtkTargetEntry targets[1] = { {f1, GTK_TARGET_SAME_APP, 2}, }; @@ -445,27 +445,18 @@ psppire_dialog_action_ctables_activate (PsppireDialogAction *pda, GVariant *para g_signal_connect (act->canvas, "draw", G_CALLBACK (canvas_draw), pda); - gtk_drag_dest_set (act->rows_pad, GTK_DEST_DEFAULT_ALL, NULL, 0, + gtk_drag_dest_set (act->rows_pad, GTK_DEST_DEFAULT_ALL, targets, 1, GDK_ACTION_LINK); - gtk_drag_dest_set (act->cols_pad, GTK_DEST_DEFAULT_ALL, NULL, 0, + gtk_drag_dest_set (act->cols_pad, GTK_DEST_DEFAULT_ALL, targets, 1, GDK_ACTION_LINK); - GtkTargetList *tl = gtk_target_list_new (te, 2); - - gtk_drag_dest_add_text_targets (act->rows_pad); - gtk_drag_dest_add_text_targets (act->cols_pad); - - gtk_drag_dest_set_target_list (act->rows_pad, tl); - gtk_drag_dest_set_target_list (act->cols_pad, tl); - g_signal_connect (act->rows_pad, "drag-drop", G_CALLBACK (drag_drop_pad), pda); g_signal_connect (act->cols_pad, "drag-drop", G_CALLBACK (drag_drop_pad), pda); pda->dialog = get_widget_assert (xml, "tables-dialog"); pda->source = get_widget_assert (xml, "dict-view"); - gtk_drag_source_set (pda->source, GDK_BUTTON1_MASK, NULL, 0, GDK_ACTION_LINK); - gtk_drag_source_set_target_list (pda->source, tl); + gtk_drag_source_set (pda->source, GDK_BUTTON1_MASK, targets, 1, GDK_ACTION_LINK); g_signal_connect (pda->source, "drag-begin", G_CALLBACK (drag_begin), pda); g_signal_connect (pda->source, "drag-end", G_CALLBACK (drag_end), pda); -- 2.30.2