callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gtkrange: Use symbolic names for button numbers

Browse Source
This commit is contained in:
Carlos Garcia Campos 2012-01-25 18:51:12 +01:00 committed by Carlos Garcia Campos
parent 15711a3bf7
commit 99c903ec04
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gtk/gtkrange.c
View File

@ -2397,13 +2397,13 @@ range_get_scroll_for_grab (GtkRange *range)
case MOUSE_STEPPER_C: case MOUSE_STEPPER_C:
switch (priv->grab_button) switch (priv->grab_button)
{ {
case 1: case GDK_BUTTON_PRIMARY:
return invert ? GTK_SCROLL_STEP_FORWARD : GTK_SCROLL_STEP_BACKWARD; return invert ? GTK_SCROLL_STEP_FORWARD : GTK_SCROLL_STEP_BACKWARD;
break; break;
case 2: case GDK_BUTTON_MIDDLE:
return invert ? GTK_SCROLL_PAGE_FORWARD : GTK_SCROLL_PAGE_BACKWARD; return invert ? GTK_SCROLL_PAGE_FORWARD : GTK_SCROLL_PAGE_BACKWARD;
break; break;
case 3: case GDK_BUTTON_SECONDARY:
return invert ? GTK_SCROLL_END : GTK_SCROLL_START; return invert ? GTK_SCROLL_END : GTK_SCROLL_START;
break; break;
} }
@ -2414,13 +2414,13 @@ range_get_scroll_for_grab (GtkRange *range)
case MOUSE_STEPPER_D: case MOUSE_STEPPER_D:
switch (priv->grab_button) switch (priv->grab_button)
{ {
case 1: case GDK_BUTTON_PRIMARY:
return invert ? GTK_SCROLL_STEP_BACKWARD : GTK_SCROLL_STEP_FORWARD; return invert ? GTK_SCROLL_STEP_BACKWARD : GTK_SCROLL_STEP_FORWARD;
break; break;
case 2: case GDK_BUTTON_MIDDLE:
return invert ? GTK_SCROLL_PAGE_BACKWARD : GTK_SCROLL_PAGE_FORWARD; return invert ? GTK_SCROLL_PAGE_BACKWARD : GTK_SCROLL_PAGE_FORWARD;
break; break;
case 3: case GDK_BUTTON_SECONDARY:
return invert ? GTK_SCROLL_START : GTK_SCROLL_END; return invert ? GTK_SCROLL_START : GTK_SCROLL_END;
break; break;
} }
@ -2546,7 +2546,7 @@ gtk_range_button_press (GtkWidget *widget,
gtk_widget_queue_draw (widget); gtk_widget_queue_draw (widget);
if (priv->mouse_location == MOUSE_TROUGH && 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 /* 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_B ||
priv->mouse_location == MOUSE_STEPPER_C || priv->mouse_location == MOUSE_STEPPER_C ||
priv->mouse_location == MOUSE_STEPPER_D) && 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; GtkAllocation allocation;
GdkRectangle *stepper_area; GdkRectangle *stepper_area;
@ -2594,7 +2596,7 @@ gtk_range_button_press (GtkWidget *widget,
return TRUE; return TRUE;
} }
else if ((priv->mouse_location == MOUSE_TROUGH && else if ((priv->mouse_location == MOUSE_TROUGH &&
event->button == 2) || event->button == GDK_BUTTON_MIDDLE) ||
priv->mouse_location == MOUSE_SLIDER) priv->mouse_location == MOUSE_SLIDER)
{ {
gboolean need_value_update = FALSE; 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, * On button 2 press, we warp the slider to mouse position,
* then begin the slider drag. * then begin the slider drag.
*/ */
if (event->button == 2) if (event->button == GDK_BUTTON_MIDDLE)
{ {
gdouble slider_low_value, slider_high_value, new_value; gdouble slider_low_value, slider_high_value, new_value;