[gtk+] gtkrange: Use symbolic names for button numbers
- From: Carlos Garcia Campos <carlosgc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] gtkrange: Use symbolic names for button numbers
- Date: Fri, 27 Jan 2012 08:49:53 +0000 (UTC)
commit 99c903ec04e221749d9e313a0b287b2e55500f9c
Author: Carlos Garcia Campos <cgarcia igalia com>
Date: Wed Jan 25 18:51:12 2012 +0100
gtkrange: Use symbolic names for button numbers
gtk/gtkrange.c | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index 5397e8c..bb13aec 100644
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -2397,13 +2397,13 @@ range_get_scroll_for_grab (GtkRange *range)
case MOUSE_STEPPER_C:
switch (priv->grab_button)
{
- case 1:
+ case GDK_BUTTON_PRIMARY:
return invert ? GTK_SCROLL_STEP_FORWARD : GTK_SCROLL_STEP_BACKWARD;
break;
- case 2:
+ case GDK_BUTTON_MIDDLE:
return invert ? GTK_SCROLL_PAGE_FORWARD : GTK_SCROLL_PAGE_BACKWARD;
break;
- case 3:
+ case GDK_BUTTON_SECONDARY:
return invert ? GTK_SCROLL_END : GTK_SCROLL_START;
break;
}
@@ -2414,13 +2414,13 @@ range_get_scroll_for_grab (GtkRange *range)
case MOUSE_STEPPER_D:
switch (priv->grab_button)
{
- case 1:
+ case GDK_BUTTON_PRIMARY:
return invert ? GTK_SCROLL_STEP_BACKWARD : GTK_SCROLL_STEP_FORWARD;
break;
- case 2:
+ case GDK_BUTTON_MIDDLE:
return invert ? GTK_SCROLL_PAGE_BACKWARD : GTK_SCROLL_PAGE_FORWARD;
break;
- case 3:
+ case GDK_BUTTON_SECONDARY:
return invert ? GTK_SCROLL_START : GTK_SCROLL_END;
break;
}
@@ -2546,7 +2546,7 @@ gtk_range_button_press (GtkWidget *widget,
gtk_widget_queue_draw (widget);
if (priv->mouse_location == MOUSE_TROUGH &&
- event->button == 1)
+ event->button == GDK_BUTTON_PRIMARY)
{
/* button 1 steps by page increment, as with button 2 on a stepper
*/
@@ -2570,7 +2570,9 @@ gtk_range_button_press (GtkWidget *widget,
priv->mouse_location == MOUSE_STEPPER_B ||
priv->mouse_location == MOUSE_STEPPER_C ||
priv->mouse_location == MOUSE_STEPPER_D) &&
- (event->button == 1 || event->button == 2 || event->button == 3))
+ (event->button == GDK_BUTTON_PRIMARY ||
+ event->button == GDK_BUTTON_MIDDLE ||
+ event->button == GDK_BUTTON_SECONDARY))
{
GtkAllocation allocation;
GdkRectangle *stepper_area;
@@ -2594,7 +2596,7 @@ gtk_range_button_press (GtkWidget *widget,
return TRUE;
}
else if ((priv->mouse_location == MOUSE_TROUGH &&
- event->button == 2) ||
+ event->button == GDK_BUTTON_MIDDLE) ||
priv->mouse_location == MOUSE_SLIDER)
{
gboolean need_value_update = FALSE;
@@ -2604,7 +2606,7 @@ gtk_range_button_press (GtkWidget *widget,
* On button 2 press, we warp the slider to mouse position,
* then begin the slider drag.
*/
- if (event->button == 2)
+ if (event->button == GDK_BUTTON_MIDDLE)
{
gdouble slider_low_value, slider_high_value, new_value;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]