[gtk+/wip/carlosg/event-delivery-cleanups: 24/30] gtk: Remove 2BUTTON and 3BUTTON events and event types
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/carlosg/event-delivery-cleanups: 24/30] gtk: Remove 2BUTTON and 3BUTTON events and event types
- Date: Fri, 15 Sep 2017 19:11:54 +0000 (UTC)
commit 4e8540a8219af4b14ba22102761ff17dc7fa46f9
Author: Carlos Garnacho <carlosg gnome org>
Date: Fri Sep 15 17:34:06 2017 +0200
gtk: Remove 2BUTTON and 3BUTTON events and event types
Those should be interpreted by widget-local gestures, not guessed at a
high level with no notions of the specific context. Users will want
GtkGestureMultiPress to replace these events.
gdk/gdkdevicemanager.c | 3 +-
gdk/gdkdisplay.c | 5 --
gdk/gdkdisplayprivate.h | 15 -----
gdk/gdkevents.c | 126 +------------------------------------------
gdk/gdkevents.h | 54 +------------------
gdk/gdkwindow.c | 2 -
gdk/win32/gdkevents-win32.c | 4 --
gtk/gtkcellrendererspin.c | 19 -------
gtk/gtkdnd.c | 4 --
gtk/gtkentry.c | 2 -
gtk/gtkmain.c | 8 ---
gtk/gtktextview.c | 2 -
gtk/gtktooltip.c | 2 -
gtk/gtktreeviewcolumn.c | 2 -
gtk/gtkwidget.c | 4 --
15 files changed, 5 insertions(+), 247 deletions(-)
---
diff --git a/gdk/gdkdevicemanager.c b/gdk/gdkdevicemanager.c
index dd8453f..9eb3954 100644
--- a/gdk/gdkdevicemanager.c
+++ b/gdk/gdkdevicemanager.c
@@ -101,8 +101,7 @@
* By default, GDK will automatically listen for events coming from all
* master devices, setting the #GdkDevice for all events coming from input
* devices. Events containing device information are #GDK_MOTION_NOTIFY,
- * #GDK_BUTTON_PRESS, #GDK_2BUTTON_PRESS, #GDK_3BUTTON_PRESS,
- * #GDK_BUTTON_RELEASE, #GDK_SCROLL, #GDK_KEY_PRESS, #GDK_KEY_RELEASE,
+ * #GDK_BUTTON_PRESS, #GDK_BUTTON_RELEASE, #GDK_SCROLL, #GDK_KEY_PRESS, #GDK_KEY_RELEASE,
* #GDK_ENTER_NOTIFY, #GDK_LEAVE_NOTIFY, #GDK_FOCUS_CHANGE,
* #GDK_PROXIMITY_IN, #GDK_PROXIMITY_OUT, #GDK_DRAG_ENTER, #GDK_DRAG_LEAVE,
* #GDK_DRAG_MOTION, #GDK_DRAG_STATUS, #GDK_DROP_START, #GDK_DROP_FINISHED
diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index 6b445c2..bdc9dab 100644
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -132,7 +132,6 @@ device_removed_cb (GdkDeviceManager *device_manager,
GdkDevice *device,
GdkDisplay *display)
{
- g_hash_table_remove (display->multiple_click_info, device);
g_hash_table_remove (display->device_grabs, device);
g_hash_table_remove (display->pointers_info, device);
@@ -386,9 +385,6 @@ gdk_display_init (GdkDisplay *display)
display->pointers_info = g_hash_table_new_full (NULL, NULL, NULL,
(GDestroyNotify) free_pointer_info);
- display->multiple_click_info = g_hash_table_new_full (NULL, NULL, NULL,
- (GDestroyNotify) g_free);
-
display->rendering_mode = _gdk_rendering_mode;
display->composited = TRUE;
@@ -439,7 +435,6 @@ gdk_display_finalize (GObject *object)
g_hash_table_destroy (display->motion_hint_info);
g_hash_table_destroy (display->pointers_info);
- g_hash_table_destroy (display->multiple_click_info);
g_list_free_full (display->input_devices, g_object_unref);
g_list_free_full (display->seats, g_object_unref);
diff --git a/gdk/gdkdisplayprivate.h b/gdk/gdkdisplayprivate.h
index 156b869..8c37ed6 100644
--- a/gdk/gdkdisplayprivate.h
+++ b/gdk/gdkdisplayprivate.h
@@ -86,16 +86,6 @@ typedef struct
guint need_touch_press_enter : 1;
} GdkPointerWindowInfo;
-typedef struct
-{
- guint32 button_click_time[2]; /* last 2 button click times */
- GdkWindow *button_window[2]; /* last 2 windows to receive button presses */
- gint button_number[2]; /* last 2 buttons to be pressed */
- gint button_x[2]; /* last 2 button click positions */
- gint button_y[2];
- GdkDevice *last_slave;
-} GdkMultipleClickInfo;
-
struct _GdkDisplay
{
GObject parent_instance;
@@ -103,11 +93,6 @@ struct _GdkDisplay
GList *queued_events;
GList *queued_tail;
- /* Information for determining if the latest button click
- * is part of a double-click or triple-click
- */
- GHashTable *multiple_click_info;
-
guint event_pause_count; /* How many times events are blocked */
guint closed : 1; /* Whether this display has been closed */
diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index 2623c9c..b47212b 100644
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -528,8 +528,6 @@ gdk_event_new (GdkEventType type)
new_event->motion.y_root = 0.;
break;
case GDK_BUTTON_PRESS:
- case GDK_2BUTTON_PRESS:
- case GDK_3BUTTON_PRESS:
case GDK_BUTTON_RELEASE:
new_event->button.x = 0.;
new_event->button.y = 0.;
@@ -700,8 +698,6 @@ gdk_event_copy (const GdkEvent *event)
break;
case GDK_BUTTON_PRESS:
- case GDK_2BUTTON_PRESS:
- case GDK_3BUTTON_PRESS:
case GDK_BUTTON_RELEASE:
if (event->button.axes)
new_event->button.axes = g_memdup (event->button.axes,
@@ -795,8 +791,6 @@ gdk_event_free (GdkEvent *event)
break;
case GDK_BUTTON_PRESS:
- case GDK_2BUTTON_PRESS:
- case GDK_3BUTTON_PRESS:
case GDK_BUTTON_RELEASE:
g_free (event->button.axes);
break;
@@ -885,8 +879,6 @@ gdk_event_get_time (const GdkEvent *event)
case GDK_MOTION_NOTIFY:
return event->motion.time;
case GDK_BUTTON_PRESS:
- case GDK_2BUTTON_PRESS:
- case GDK_3BUTTON_PRESS:
case GDK_BUTTON_RELEASE:
return event->button.time;
case GDK_TOUCH_BEGIN:
@@ -978,8 +970,6 @@ gdk_event_get_state (const GdkEvent *event,
*state = event->motion.state;
return TRUE;
case GDK_BUTTON_PRESS:
- case GDK_2BUTTON_PRESS:
- case GDK_3BUTTON_PRESS:
case GDK_BUTTON_RELEASE:
*state = event->button.state;
return TRUE;
@@ -1083,8 +1073,6 @@ gdk_event_get_coords (const GdkEvent *event,
y = event->scroll.y;
break;
case GDK_BUTTON_PRESS:
- case GDK_2BUTTON_PRESS:
- case GDK_3BUTTON_PRESS:
case GDK_BUTTON_RELEASE:
x = event->button.x;
y = event->button.y;
@@ -1152,8 +1140,6 @@ gdk_event_get_root_coords (const GdkEvent *event,
y = event->scroll.y_root;
break;
case GDK_BUTTON_PRESS:
- case GDK_2BUTTON_PRESS:
- case GDK_3BUTTON_PRESS:
case GDK_BUTTON_RELEASE:
x = event->button.x_root;
y = event->button.y_root;
@@ -1223,8 +1209,6 @@ gdk_event_set_coords (GdkEvent *event,
event->scroll.y = y;
break;
case GDK_BUTTON_PRESS:
- case GDK_2BUTTON_PRESS:
- case GDK_3BUTTON_PRESS:
case GDK_BUTTON_RELEASE:
event->button.x = x;
event->button.y = y;
@@ -1276,8 +1260,6 @@ gdk_event_get_button (const GdkEvent *event,
switch (event->type)
{
case GDK_BUTTON_PRESS:
- case GDK_2BUTTON_PRESS:
- case GDK_3BUTTON_PRESS:
case GDK_BUTTON_RELEASE:
number = event->button.button;
break;
@@ -1322,12 +1304,6 @@ gdk_event_get_click_count (const GdkEvent *event,
case GDK_BUTTON_RELEASE:
number = 1;
break;
- case GDK_2BUTTON_PRESS:
- number = 2;
- break;
- case GDK_3BUTTON_PRESS:
- number = 3;
- break;
default:
fetched = FALSE;
break;
@@ -1634,8 +1610,6 @@ gdk_event_set_device (GdkEvent *event,
event->motion.device = device;
break;
case GDK_BUTTON_PRESS:
- case GDK_2BUTTON_PRESS:
- case GDK_3BUTTON_PRESS:
case GDK_BUTTON_RELEASE:
event->button.device = device;
break;
@@ -1686,8 +1660,6 @@ gdk_event_get_device (const GdkEvent *event)
case GDK_MOTION_NOTIFY:
return event->motion.device;
case GDK_BUTTON_PRESS:
- case GDK_2BUTTON_PRESS:
- case GDK_3BUTTON_PRESS:
case GDK_BUTTON_RELEASE:
return event->button.device;
case GDK_TOUCH_BEGIN:
@@ -1709,8 +1681,6 @@ gdk_event_get_device (const GdkEvent *event)
{
case GDK_MOTION_NOTIFY:
case GDK_BUTTON_PRESS:
- case GDK_2BUTTON_PRESS:
- case GDK_3BUTTON_PRESS:
case GDK_BUTTON_RELEASE:
case GDK_TOUCH_BEGIN:
case GDK_TOUCH_UPDATE:
@@ -2153,96 +2123,6 @@ gdk_get_show_events (void)
return (_gdk_debug_flags & GDK_DEBUG_EVENTS) != 0;
}
-static void
-gdk_synthesize_click (GdkDisplay *display,
- GdkEvent *event,
- gint nclicks)
-{
- GdkEvent *event_copy;
-
- event_copy = gdk_event_copy (event);
- event_copy->type = (nclicks == 2) ? GDK_2BUTTON_PRESS : GDK_3BUTTON_PRESS;
-
- _gdk_event_queue_append (display, event_copy);
-}
-
-void
-_gdk_event_button_generate (GdkDisplay *display,
- GdkEvent *event)
-{
- GdkMultipleClickInfo *info;
- GdkDevice *source_device;
-
- g_return_if_fail (event->type == GDK_BUTTON_PRESS);
-
- source_device = gdk_event_get_source_device (event);
- info = g_hash_table_lookup (display->multiple_click_info, event->button.device);
-
- if (G_UNLIKELY (!info))
- {
- info = g_new0 (GdkMultipleClickInfo, 1);
- info->button_number[0] = info->button_number[1] = -1;
-
- g_hash_table_insert (display->multiple_click_info,
- event->button.device, info);
- }
-
- if ((event->button.time < (info->button_click_time[1] + 2 * display->double_click_time)) &&
- (event->button.window == info->button_window[1]) &&
- (event->button.button == info->button_number[1]) &&
- (source_device == info->last_slave) &&
- (ABS (event->button.x - info->button_x[1]) <= display->double_click_distance) &&
- (ABS (event->button.y - info->button_y[1]) <= display->double_click_distance))
- {
- gdk_synthesize_click (display, event, 3);
-
- info->button_click_time[1] = 0;
- info->button_click_time[0] = 0;
- info->button_window[1] = NULL;
- info->button_window[0] = NULL;
- info->button_number[1] = -1;
- info->button_number[0] = -1;
- info->button_x[0] = info->button_x[1] = 0;
- info->button_y[0] = info->button_y[1] = 0;
- info->last_slave = NULL;
- }
- else if ((event->button.time < (info->button_click_time[0] + display->double_click_time)) &&
- (event->button.window == info->button_window[0]) &&
- (event->button.button == info->button_number[0]) &&
- (source_device == info->last_slave) &&
- (ABS (event->button.x - info->button_x[0]) <= display->double_click_distance) &&
- (ABS (event->button.y - info->button_y[0]) <= display->double_click_distance))
- {
- gdk_synthesize_click (display, event, 2);
-
- info->button_click_time[1] = info->button_click_time[0];
- info->button_click_time[0] = event->button.time;
- info->button_window[1] = info->button_window[0];
- info->button_window[0] = event->button.window;
- info->button_number[1] = info->button_number[0];
- info->button_number[0] = event->button.button;
- info->button_x[1] = info->button_x[0];
- info->button_x[0] = event->button.x;
- info->button_y[1] = info->button_y[0];
- info->button_y[0] = event->button.y;
- info->last_slave = source_device;
- }
- else
- {
- info->button_click_time[1] = 0;
- info->button_click_time[0] = event->button.time;
- info->button_window[1] = NULL;
- info->button_window[0] = event->button.window;
- info->button_number[1] = -1;
- info->button_number[0] = event->button.button;
- info->button_x[1] = 0;
- info->button_x[0] = event->button.x;
- info->button_y[1] = 0;
- info->button_y[0] = event->button.y;
- info->last_slave = source_device;
- }
-}
-
static GList *
gdk_get_pending_window_state_event_link (GdkWindow *window)
{
@@ -2340,8 +2220,7 @@ gdk_synthesize_window_state (GdkWindow *window,
* @msec: double click time in milliseconds (thousandths of a second)
*
* Sets the double click time (two clicks within this time interval
- * count as a double click and result in a #GDK_2BUTTON_PRESS event).
- * Applications should not set this, it is a global
+ * count as a double click). Applications should not set this, it is a global
* user-configured setting.
*
* Since: 2.2
@@ -2375,8 +2254,7 @@ gdk_set_double_click_time (guint msec)
* @distance: distance in pixels
*
* Sets the double click distance (two clicks within this distance
- * count as a double click and result in a #GDK_2BUTTON_PRESS event).
- * See also gdk_display_set_double_click_time().
+ * count as a double click). See also gdk_display_set_double_click_time().
* Applications should not set this, it is a global
* user-configured setting.
*
diff --git a/gdk/gdkevents.h b/gdk/gdkevents.h
index 405ccc1..a0eabe2 100644
--- a/gdk/gdkevents.h
+++ b/gdk/gdkevents.h
@@ -224,13 +224,6 @@ typedef GdkFilterReturn (*GdkFilterFunc) (GdkXEvent *xevent,
* redrawn.
* @GDK_MOTION_NOTIFY: the pointer (usually a mouse) has moved.
* @GDK_BUTTON_PRESS: a mouse button has been pressed.
- * @GDK_2BUTTON_PRESS: a mouse button has been double-clicked (clicked twice
- * within a short period of time). Note that each click also generates a
- * %GDK_BUTTON_PRESS event.
- * @GDK_DOUBLE_BUTTON_PRESS: alias for %GDK_2BUTTON_PRESS, added in 3.6.
- * @GDK_3BUTTON_PRESS: a mouse button has been clicked 3 times in a short period
- * of time. Note that each click also generates a %GDK_BUTTON_PRESS event.
- * @GDK_TRIPLE_BUTTON_PRESS: alias for %GDK_3BUTTON_PRESS, added in 3.6.
* @GDK_BUTTON_RELEASE: a mouse button has been released.
* @GDK_KEY_PRESS: a key has been pressed.
* @GDK_KEY_RELEASE: a key has been released.
@@ -298,13 +291,6 @@ typedef GdkFilterReturn (*GdkFilterFunc) (GdkXEvent *xevent,
* Do not confuse these events with the signals that GTK+ widgets emit.
* Although many of these events result in corresponding signals being emitted,
* the events are often transformed or filtered along the way.
- *
- * In some language bindings, the values %GDK_2BUTTON_PRESS and
- * %GDK_3BUTTON_PRESS would translate into something syntactically
- * invalid (eg `Gdk.EventType.2ButtonPress`, where a
- * symbol is not allowed to start with a number). In that case, the
- * aliases %GDK_DOUBLE_BUTTON_PRESS and %GDK_TRIPLE_BUTTON_PRESS can
- * be used instead.
*/
typedef enum
{
@@ -314,10 +300,6 @@ typedef enum
GDK_EXPOSE = 2,
GDK_MOTION_NOTIFY = 3,
GDK_BUTTON_PRESS = 4,
- GDK_2BUTTON_PRESS = 5,
- GDK_DOUBLE_BUTTON_PRESS = GDK_2BUTTON_PRESS,
- GDK_3BUTTON_PRESS = 6,
- GDK_TRIPLE_BUTTON_PRESS = GDK_3BUTTON_PRESS,
GDK_BUTTON_RELEASE = 7,
GDK_KEY_PRESS = 8,
GDK_KEY_RELEASE = 9,
@@ -674,8 +656,7 @@ struct _GdkEventMotion
/**
* GdkEventButton:
- * @type: the type of the event (%GDK_BUTTON_PRESS, %GDK_2BUTTON_PRESS,
- * %GDK_3BUTTON_PRESS or %GDK_BUTTON_RELEASE).
+ * @type: the type of the event (%GDK_BUTTON_PRESS or %GDK_BUTTON_RELEASE).
* @window: the window which received the event.
* @send_event: %TRUE if the event was sent explicitly.
* @time: the time of the event in milliseconds.
@@ -698,38 +679,7 @@ struct _GdkEventMotion
* screen.
*
* Used for button press and button release events. The
- * @type field will be one of %GDK_BUTTON_PRESS,
- * %GDK_2BUTTON_PRESS, %GDK_3BUTTON_PRESS or %GDK_BUTTON_RELEASE,
- *
- * Double and triple-clicks result in a sequence of events being received.
- * For double-clicks the order of events will be:
- *
- * - %GDK_BUTTON_PRESS
- * - %GDK_BUTTON_RELEASE
- * - %GDK_BUTTON_PRESS
- * - %GDK_2BUTTON_PRESS
- * - %GDK_BUTTON_RELEASE
- *
- * Note that the first click is received just like a normal
- * button press, while the second click results in a %GDK_2BUTTON_PRESS
- * being received just after the %GDK_BUTTON_PRESS.
- *
- * Triple-clicks are very similar to double-clicks, except that
- * %GDK_3BUTTON_PRESS is inserted after the third click. The order of the
- * events is:
- *
- * - %GDK_BUTTON_PRESS
- * - %GDK_BUTTON_RELEASE
- * - %GDK_BUTTON_PRESS
- * - %GDK_2BUTTON_PRESS
- * - %GDK_BUTTON_RELEASE
- * - %GDK_BUTTON_PRESS
- * - %GDK_3BUTTON_PRESS
- * - %GDK_BUTTON_RELEASE
- *
- * For a double click to occur, the second button press must occur within
- * 1/4 of a second of the first. For a triple click to occur, the third
- * button press must also occur within 1/2 second of the first button press.
+ * @type field will be one of %GDK_BUTTON_PRESS or %GDK_BUTTON_RELEASE,
*/
struct _GdkEventButton
{
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 2e8dcf4..d8309f3 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -5734,8 +5734,6 @@ _gdk_make_event (GdkWindow *window,
break;
case GDK_BUTTON_PRESS:
- case GDK_2BUTTON_PRESS:
- case GDK_3BUTTON_PRESS:
case GDK_BUTTON_RELEASE:
event->button.time = the_time;
event->button.axes = NULL;
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index 3a55329..0602bba 100644
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -651,8 +651,6 @@ _gdk_win32_print_event (const GdkEvent *event)
CASE (GDK_EXPOSE);
CASE (GDK_MOTION_NOTIFY);
CASE (GDK_BUTTON_PRESS);
- CASE (GDK_2BUTTON_PRESS);
- CASE (GDK_3BUTTON_PRESS);
CASE (GDK_BUTTON_RELEASE);
CASE (GDK_KEY_PRESS);
CASE (GDK_KEY_RELEASE);
@@ -704,8 +702,6 @@ _gdk_win32_print_event (const GdkEvent *event)
print_event_state (event->motion.state);
break;
case GDK_BUTTON_PRESS:
- case GDK_2BUTTON_PRESS:
- case GDK_3BUTTON_PRESS:
case GDK_BUTTON_RELEASE:
g_print ("%d (%.4g,%.4g) (%.4g,%.4g) ",
event->button.button,
diff --git a/gtk/gtkcellrendererspin.c b/gtk/gtkcellrendererspin.c
index c7e9f7c..d38aa5e 100644
--- a/gtk/gtkcellrendererspin.c
+++ b/gtk/gtkcellrendererspin.c
@@ -297,21 +297,6 @@ gtk_cell_renderer_spin_key_press_event (GtkWidget *widget,
return FALSE;
}
-static gboolean
-gtk_cell_renderer_spin_button_press_event (GtkWidget *widget,
- GdkEventButton *event,
- gpointer user_data)
-{
- /* Block 2BUTTON and 3BUTTON here, so that they won't be eaten
- * by tree view.
- */
- if (event->type == GDK_2BUTTON_PRESS
- || event->type == GDK_3BUTTON_PRESS)
- return TRUE;
-
- return FALSE;
-}
-
static GtkCellEditable *
gtk_cell_renderer_spin_start_editing (GtkCellRenderer *cell,
GdkEvent *event,
@@ -340,10 +325,6 @@ gtk_cell_renderer_spin_start_editing (GtkCellRenderer *cell,
spin = gtk_spin_button_new (priv->adjustment,
priv->climb_rate, priv->digits);
- g_signal_connect (spin, "button-press-event",
- G_CALLBACK (gtk_cell_renderer_spin_button_press_event),
- NULL);
-
g_object_get (cell_text, "text", &text, NULL);
if (text)
{
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 9162e3e..3495ee5 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -389,8 +389,6 @@ gtk_drag_get_event_time (GdkEvent *event)
case GDK_MOTION_NOTIFY:
tm = event->motion.time; break;
case GDK_BUTTON_PRESS:
- case GDK_2BUTTON_PRESS:
- case GDK_3BUTTON_PRESS:
case GDK_BUTTON_RELEASE:
tm = event->button.time; break;
case GDK_KEY_PRESS:
@@ -435,8 +433,6 @@ gtk_drag_get_event_actions (const GdkEvent *event,
state = event->motion.state;
break;
case GDK_BUTTON_PRESS:
- case GDK_2BUTTON_PRESS:
- case GDK_3BUTTON_PRESS:
case GDK_BUTTON_RELEASE:
state = event->button.state;
break;
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 7c5673c..ee87b73 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -3545,8 +3545,6 @@ gtk_entry_event (GtkWidget *widget,
icon_info->current_sequence = sequence;
/* Fall through */
case GDK_BUTTON_PRESS:
- case GDK_2BUTTON_PRESS:
- case GDK_3BUTTON_PRESS:
priv->start_x = x;
priv->start_y = y;
icon_info->pressed = TRUE;
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 323e9c9..85e1d9d 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -1148,8 +1148,6 @@ rewrite_event_for_window (GdkEvent *event,
&event->scroll.x, &event->scroll.y);
break;
case GDK_BUTTON_PRESS:
- case GDK_2BUTTON_PRESS:
- case GDK_3BUTTON_PRESS:
case GDK_BUTTON_RELEASE:
rewrite_events_translate (event->any.window,
new_window,
@@ -1217,8 +1215,6 @@ rewrite_event_for_grabs (GdkEvent *event)
{
case GDK_SCROLL:
case GDK_BUTTON_PRESS:
- case GDK_2BUTTON_PRESS:
- case GDK_3BUTTON_PRESS:
case GDK_BUTTON_RELEASE:
case GDK_MOTION_NOTIFY:
case GDK_PROXIMITY_IN:
@@ -1809,8 +1805,6 @@ gtk_main_do_event (GdkEvent *event)
/* else fall through */
case GDK_SCROLL:
case GDK_BUTTON_PRESS:
- case GDK_2BUTTON_PRESS:
- case GDK_3BUTTON_PRESS:
case GDK_TOUCH_BEGIN:
case GDK_MOTION_NOTIFY:
case GDK_BUTTON_RELEASE:
@@ -1852,8 +1846,6 @@ gtk_main_do_event (GdkEvent *event)
if (event->type == GDK_ENTER_NOTIFY
|| event->type == GDK_LEAVE_NOTIFY
|| event->type == GDK_BUTTON_PRESS
- || event->type == GDK_2BUTTON_PRESS
- || event->type == GDK_3BUTTON_PRESS
|| event->type == GDK_KEY_PRESS
|| event->type == GDK_DRAG_ENTER
|| event->type == GDK_GRAB_BROKEN
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 0b81975..4d03938 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -4946,8 +4946,6 @@ get_event_coordinates (GdkEvent *event, gint *x, gint *y)
break;
case GDK_BUTTON_PRESS:
- case GDK_2BUTTON_PRESS:
- case GDK_3BUTTON_PRESS:
case GDK_BUTTON_RELEASE:
*x = event->button.x;
*y = event->button.y;
diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
index 67fc943..4d57c5a 100644
--- a/gtk/gtktooltip.c
+++ b/gtk/gtktooltip.c
@@ -1449,8 +1449,6 @@ gtk_tooltip_handle_event_internal (GdkEvent *event)
switch (event->type)
{
case GDK_BUTTON_PRESS:
- case GDK_2BUTTON_PRESS:
- case GDK_3BUTTON_PRESS:
case GDK_KEY_PRESS:
case GDK_DRAG_ENTER:
case GDK_GRAB_BROKEN:
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 02d4436..6ae6427 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -1053,8 +1053,6 @@ gtk_tree_view_column_button_event (GtkWidget *widget,
switch (event->type)
{
case GDK_BUTTON_PRESS:
- case GDK_2BUTTON_PRESS:
- case GDK_3BUTTON_PRESS:
case GDK_MOTION_NOTIFY:
case GDK_BUTTON_RELEASE:
case GDK_ENTER_NOTIFY:
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 625262a..4faa25b 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -6704,8 +6704,6 @@ event_window_is_still_viewable (const GdkEvent *event)
case GDK_EXPOSE:
case GDK_MOTION_NOTIFY:
case GDK_BUTTON_PRESS:
- case GDK_2BUTTON_PRESS:
- case GDK_3BUTTON_PRESS:
case GDK_KEY_PRESS:
case GDK_ENTER_NOTIFY:
case GDK_PROXIMITY_IN:
@@ -6839,8 +6837,6 @@ gtk_widget_emit_event_signals (GtkWidget *widget,
signal_num = -1;
break;
case GDK_BUTTON_PRESS:
- case GDK_2BUTTON_PRESS:
- case GDK_3BUTTON_PRESS:
signal_num = BUTTON_PRESS_EVENT;
break;
case GDK_TOUCH_BEGIN:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
