Commit df21a706 authored by Federico Mena Quintero's avatar Federico Mena Quintero Committed by Arturo Espinosa

Allow button 2 to act as GDK_ACTION_ASK. Also, allow MOD1 to specify

1999-01-20  Federico Mena Quintero  <federico@nuclecu.unam.mx>

	* gtk/gtkdnd.c (gtk_drag_get_event_action): Allow button 2 to act
	as GDK_ACTION_ASK.  Also, allow MOD1 to specify GDK_ACTION_ASK
	only if that action is enabled in the actions argument.
parent 255005f0
1999-01-20 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gtk/gtkdnd.c (gtk_drag_get_event_action): Allow button 2 to act
as GDK_ACTION_ASK. Also, allow MOD1 to specify GDK_ACTION_ASK
only if that action is enabled in the actions argument.
1999-01-20 Raja R Harinath <harinath@cs.umn.edu>
* configure.in (gtklocaledir): New variable. Define to
......
1999-01-20 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gtk/gtkdnd.c (gtk_drag_get_event_action): Allow button 2 to act
as GDK_ACTION_ASK. Also, allow MOD1 to specify GDK_ACTION_ASK
only if that action is enabled in the actions argument.
1999-01-20 Raja R Harinath <harinath@cs.umn.edu>
* configure.in (gtklocaledir): New variable. Define to
......
1999-01-20 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gtk/gtkdnd.c (gtk_drag_get_event_action): Allow button 2 to act
as GDK_ACTION_ASK. Also, allow MOD1 to specify GDK_ACTION_ASK
only if that action is enabled in the actions argument.
1999-01-20 Raja R Harinath <harinath@cs.umn.edu>
* configure.in (gtklocaledir): New variable. Define to
......
1999-01-20 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gtk/gtkdnd.c (gtk_drag_get_event_action): Allow button 2 to act
as GDK_ACTION_ASK. Also, allow MOD1 to specify GDK_ACTION_ASK
only if that action is enabled in the actions argument.
1999-01-20 Raja R Harinath <harinath@cs.umn.edu>
* configure.in (gtklocaledir): New variable. Define to
......
1999-01-20 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gtk/gtkdnd.c (gtk_drag_get_event_action): Allow button 2 to act
as GDK_ACTION_ASK. Also, allow MOD1 to specify GDK_ACTION_ASK
only if that action is enabled in the actions argument.
1999-01-20 Raja R Harinath <harinath@cs.umn.edu>
* configure.in (gtklocaledir): New variable. Define to
......
1999-01-20 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gtk/gtkdnd.c (gtk_drag_get_event_action): Allow button 2 to act
as GDK_ACTION_ASK. Also, allow MOD1 to specify GDK_ACTION_ASK
only if that action is enabled in the actions argument.
1999-01-20 Raja R Harinath <harinath@cs.umn.edu>
* configure.in (gtklocaledir): New variable. Define to
......
1999-01-20 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gtk/gtkdnd.c (gtk_drag_get_event_action): Allow button 2 to act
as GDK_ACTION_ASK. Also, allow MOD1 to specify GDK_ACTION_ASK
only if that action is enabled in the actions argument.
1999-01-20 Raja R Harinath <harinath@cs.umn.edu>
* configure.in (gtklocaledir): New variable. Define to
......
......@@ -421,7 +421,7 @@ gtk_drag_get_event_action (GdkEvent *event, gint button, GdkDragAction actions)
break;
}
if (button == 3)
if (((button == 2) || (button == 3)) && (actions & GDK_ACTION_ASK))
return GDK_ACTION_ASK;
if (state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK))
......@@ -435,7 +435,7 @@ gtk_drag_get_event_action (GdkEvent *event, gint button, GdkDragAction actions)
}
else
{
if (state & (GDK_MOD1_MASK))
if ((state & (GDK_MOD1_MASK)) && (actions & GDK_ACTION_ASK))
return GDK_ACTION_ASK;
if (actions & GDK_ACTION_COPY)
......
......@@ -1009,6 +1009,7 @@ static const GtkEnumValue _gdk_drag_protocol_values[] = {
{ GDK_DRAG_PROTO_MOTIF, "GDK_DRAG_PROTO_MOTIF", "motif" },
{ GDK_DRAG_PROTO_XDND, "GDK_DRAG_PROTO_XDND", "xdnd" },
{ GDK_DRAG_PROTO_ROOTWIN, "GDK_DRAG_PROTO_ROOTWIN", "rootwin" },
{ GDK_DRAG_PROTO_NONE, "GDK_DRAG_PROTO_NONE", "none" },
{ 0, NULL, NULL }
};
static const GtkEnumValue _gdk_rgb_dither_values[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment