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-wrap-table.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-wrap-table.c')
| -rw-r--r-- | eel/eel-wrap-table.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/eel/eel-wrap-table.c b/eel/eel-wrap-table.c index 56c1e5e9..0d77b442 100644 --- a/eel/eel-wrap-table.c +++ b/eel/eel-wrap-table.c @@ -30,10 +30,6 @@ #include "eel-gtk-extensions.h" #include <gtk/gtk.h> -#if !GTK_CHECK_VERSION(3,0,0) -#define gtk_widget_get_preferred_size(x,y,z) gtk_widget_size_request(x,y) -#endif - /* Arguments */ enum { @@ -200,7 +196,6 @@ eel_wrap_table_size_request (GtkWidget *widget, requisition->height = content_dimensions.height + gtk_container_get_border_width (GTK_CONTAINER (widget)) * 2; } -#if GTK_CHECK_VERSION (3, 0, 0) static void eel_wrap_table_get_preferred_width (GtkWidget *widget, gint *minimum_width, @@ -220,7 +215,6 @@ eel_wrap_table_get_preferred_height (GtkWidget *widget, eel_wrap_table_size_request (widget, &req); *minimum_height = *natural_height = req.height; } -#endif static void eel_wrap_table_size_allocate (GtkWidget *widget, @@ -239,37 +233,23 @@ eel_wrap_table_size_allocate (GtkWidget *widget, } static int -#if GTK_CHECK_VERSION (3, 0, 0) eel_wrap_table_draw (GtkWidget *widget, cairo_t *cr) -#else -eel_wrap_table_expose_event (GtkWidget *widget, - GdkEventExpose *event) -#endif { EelWrapTable *wrap_table; GList *iterator; g_assert (EEL_IS_WRAP_TABLE (widget)); g_assert (gtk_widget_get_realized (widget)); -#if !GTK_CHECK_VERSION (3, 0, 0) - g_assert (event != NULL); -#endif wrap_table = EEL_WRAP_TABLE (widget); for (iterator = wrap_table->details->children; iterator; iterator = iterator->next) { g_assert (GTK_IS_WIDGET (iterator->data)); -#if GTK_CHECK_VERSION (3, 0, 0) gtk_container_propagate_draw (GTK_CONTAINER (widget), GTK_WIDGET (iterator->data), cr); -#else - gtk_container_propagate_expose (GTK_CONTAINER (widget), - GTK_WIDGET (iterator->data), - event); -#endif } return FALSE; @@ -451,14 +431,9 @@ eel_wrap_table_class_init (EelWrapTableClass *wrap_table_class) /* GtkWidgetClass */ widget_class->size_allocate = eel_wrap_table_size_allocate; -#if GTK_CHECK_VERSION (3, 0, 0) widget_class->get_preferred_width = eel_wrap_table_get_preferred_width; widget_class->get_preferred_height = eel_wrap_table_get_preferred_height; widget_class->draw = eel_wrap_table_draw; -#else - widget_class->size_request = eel_wrap_table_size_request; - widget_class->expose_event = eel_wrap_table_expose_event; -#endif widget_class->map = eel_wrap_table_map; widget_class->unmap = eel_wrap_table_unmap; widget_class->realize = eel_wrap_table_realize; @@ -798,13 +773,8 @@ wrap_table_child_focus_in (GtkWidget *widget, if (!wrap_table_child_visible_in (widget, viewport)) { -#if GTK_CHECK_VERSION (3, 0, 0) hadj = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (viewport)); vadj = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (viewport)); -#else - hadj = gtk_viewport_get_hadjustment (GTK_VIEWPORT (viewport)); - vadj = gtk_viewport_get_vadjustment (GTK_VIEWPORT (viewport)); -#endif gtk_widget_translate_coordinates (widget, container, 0, 0, &x, &y); |