Revert "Forward-port a GtkAdjustment compatibility fix"

[~andy/gtk] / gtk / gtkcombobox.c

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index fd92dd0d5d52e114fb5c7f41ac54598fd620798f..23b159b88b8f2ada723940fc757c023330c7bed0 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -4056,13 +4056,13 @@ gtk_combo_box_list_auto_scroll (GtkComboBox *combo_box,
          adj->lower < adj->value)
        {
          value = adj->value - (tree_view->allocation.x - x + 1);
-         gtk_adjustment_set_value (adj, CLAMP (value, adj->lower, adj->upper - adj->page_size));
+         gtk_adjustment_set_value (adj, value);
        }
       else if (x >= tree_view->allocation.x + tree_view->allocation.width &&
               adj->upper - adj->page_size > adj->value)
        {
          value = adj->value + (x - tree_view->allocation.x - tree_view->allocation.width + 1);
-         gtk_adjustment_set_value (adj, CLAMP (value, 0.0, adj->upper - adj->page_size));
+         gtk_adjustment_set_value (adj, MAX (value, 0.0));
        }
     }
 
@@ -4073,13 +4073,13 @@ gtk_combo_box_list_auto_scroll (GtkComboBox *combo_box,
          adj->lower < adj->value)
        {
          value = adj->value - (tree_view->allocation.y - y + 1);
-         gtk_adjustment_set_value (adj, CLAMP (value, adj->lower, adj->upper - adj->page_size));
+         gtk_adjustment_set_value (adj, value);
        }
       else if (y >= tree_view->allocation.height &&
               adj->upper - adj->page_size > adj->value)
        {
          value = adj->value + (y - tree_view->allocation.height + 1);
-         gtk_adjustment_set_value (adj, CLAMP (value, 0.0, adj->upper - adj->page_size));
+         gtk_adjustment_set_value (adj, MAX (value, 0.0));
        }
     }
 }