diff options
| author | Federico Mena Quintero <federico@nuclecu.unam.mx> | 1999-01-20 23:53:29 +0000 |
|---|---|---|
| committer | Arturo Espinosa <unammx@src.gnome.org> | 1999-01-20 23:53:29 +0000 |
| commit | df21a7064f0c5130d84e035f820eae197024992b (patch) | |
| tree | 7ef05d7e315f940d7940e61e714da3beaee9c3bc | |
| parent | 255005f0e9d36d3bc04ff0f6d8d368b0a6c0a7a9 (diff) | |
| download | gdk-pixbuf-df21a7064f0c5130d84e035f820eae197024992b.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 6 | ||||
| -rw-r--r-- | gtk/gtkdnd.c | 4 | ||||
| -rw-r--r-- | gtk/gtktypebuiltins_evals.c | 1 |
9 files changed, 45 insertions, 2 deletions
@@ -1,3 +1,9 @@ +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 diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 5b4e8cd02..63d8f8766 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +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 diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5b4e8cd02..63d8f8766 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +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 diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 5b4e8cd02..63d8f8766 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +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 diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 5b4e8cd02..63d8f8766 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +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 diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 5b4e8cd02..63d8f8766 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +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 diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5b4e8cd02..63d8f8766 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +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 diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index 62af27d5d..35d95411a 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -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) diff --git a/gtk/gtktypebuiltins_evals.c b/gtk/gtktypebuiltins_evals.c index 4dc9032e1..37657240f 100644 --- a/gtk/gtktypebuiltins_evals.c +++ b/gtk/gtktypebuiltins_evals.c @@ -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[] = { |