diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-06-24 10:45:25 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-06-24 21:43:13 +0200 |
| commit | 5536224038fc95369be7f9a7240ec12e3d0be5c3 (patch) | |
| tree | a249b36bade9c36f482db7fb7aadbce486f6410b /vcl | |
| parent | 31eed60da71f42fe232be1c4877056c0dc9f777a (diff) | |
gtk4: gdk_drop_get_actions is a better match
Change-Id: I3442f3498f83da8d4eef3004b79925099dd1306d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117772
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk3/gtkframe.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx index 4a4f5236a19e..80624112d9ec 100644 --- a/vcl/unx/gtk3/gtkframe.cxx +++ b/vcl/unx/gtk3/gtkframe.cxx @@ -4500,7 +4500,7 @@ gboolean GtkInstDropTarget::signalDragDrop(GtkDropTargetAsync* context, GdkDrop* #if !GTK_CHECK_VERSION(4, 0, 0) aEvent.DropAction = GdkToVcl(gdk_drag_context_get_selected_action(context)); #else - aEvent.DropAction = GdkToVcl(getPreferredDragAction(GdkToVcl(gtk_drop_target_async_get_actions(context)))); + aEvent.DropAction = GdkToVcl(getPreferredDragAction(GdkToVcl(gdk_drop_get_actions(drop)))); #endif // ACTION_DEFAULT is documented as... // 'This means the user did not press any key during the Drag and Drop operation @@ -4515,7 +4515,7 @@ gboolean GtkInstDropTarget::signalDragDrop(GtkDropTargetAsync* context, GdkDrop* GdkModifierType mask; gdk_window_get_pointer(widget_get_surface(pWidget), nullptr, nullptr, &mask); #else - aEvent.SourceActions = GdkToVcl(gtk_drop_target_async_get_actions(context)); + aEvent.SourceActions = GdkToVcl(gdk_drop_get_actions(drop)); GdkModifierType mask = gtk_event_controller_get_current_event_state(GTK_EVENT_CONTROLLER(context)); #endif if (!(mask & (GDK_CONTROL_MASK | GDK_SHIFT_MASK))) @@ -4660,7 +4660,7 @@ GdkDragAction GtkInstDropTarget::signalDragMotion(GtkDropTargetAsync *context, G GdkModifierType mask; gdk_window_get_pointer(widget_get_surface(pWidget), nullptr, nullptr, &mask); #else - sal_Int8 nSourceActions = GdkToVcl(gtk_drop_target_async_get_actions(context)); + sal_Int8 nSourceActions = GdkToVcl(gdk_drop_get_actions(pDrop)); GdkModifierType mask = gtk_event_controller_get_current_event_state(GTK_EVENT_CONTROLLER(context)); #endif |