diff options
| author | lukefromdc <[email protected]> | 2016-11-22 15:02:51 -0500 |
|---|---|---|
| committer | lukefromdc <[email protected]> | 2016-11-22 15:02:51 -0500 |
| commit | 276eb145ce96d5f75f8d3901daf6310f60ddbb81 (patch) | |
| tree | 544f41e76c9a91973867065696fc2e414ca60170 /eel/eel-gtk-extensions.c | |
| parent | 969e4d021fe49654fe6e5ee7e88c920fec126505 (diff) | |
| download | caja-276eb145ce96d5f75f8d3901daf6310f60ddbb81.tar.bz2 caja-276eb145ce96d5f75f8d3901daf6310f60ddbb81.tar.xz | |
move to GTK+3 (>= 3.14), drop libunique, GTK+2 code, and --with-gtk build option
*Remove GTK_VERSION_CHECK (3, 0, 0) and libunique selectors
*Remove GTK2 and libunique specific code.
*Leaves selector for specific GTK3 versions.
*Remove #DEFINES for vbox/hbox previously required for GTK2 compatability
*Keep vbox in caja-spatial-window.c, it is necessary for the desktop to work
*spatial-window vbox issue at https://github.com/mate-desktop/caja/issues/591
Diffstat (limited to 'eel/eel-gtk-extensions.c')
| -rw-r--r-- | eel/eel-gtk-extensions.c | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/eel/eel-gtk-extensions.c b/eel/eel-gtk-extensions.c index 4969d7aa..800fe6cd 100644 --- a/eel/eel-gtk-extensions.c +++ b/eel/eel-gtk-extensions.c @@ -353,40 +353,6 @@ eel_gtk_menu_tool_button_get_button (GtkMenuToolButton *tool_button) return button; } -#if !GTK_CHECK_VERSION (3, 0, 0) -/* The standard gtk_adjustment_set_value ignores page size, which - * disagrees with the logic used by scroll bars, for example. - */ -void -eel_gtk_adjustment_set_value (GtkAdjustment *adjustment, - float value) -{ - float upper_page_start, clamped_value; - - g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment)); - - upper_page_start = MAX (gtk_adjustment_get_upper (adjustment) - - gtk_adjustment_get_page_size (adjustment), - gtk_adjustment_get_lower (adjustment)); - clamped_value = CLAMP (value, gtk_adjustment_get_lower (adjustment), upper_page_start); - if (clamped_value != gtk_adjustment_get_value (adjustment)) - { - gtk_adjustment_set_value (adjustment, clamped_value); - gtk_adjustment_value_changed (adjustment); - } -} - -/* Clamp a value if the minimum or maximum has changed. */ -void -eel_gtk_adjustment_clamp_value (GtkAdjustment *adjustment) -{ - g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment)); - - eel_gtk_adjustment_set_value (adjustment, - gtk_adjustment_get_value (adjustment)); -} -#endif - /** * eel_gtk_label_make_bold. * @@ -408,11 +374,7 @@ eel_gtk_label_make_bold (GtkLabel *label) * theme or user prefs, since the font desc only has the * weight flag turned on. */ -#if GTK_CHECK_VERSION(3,0,0) gtk_widget_override_font (GTK_WIDGET (label), font_desc); -#else - gtk_widget_modify_font (GTK_WIDGET (label), font_desc); -#endif pango_font_description_free (font_desc); } |