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 /libcaja-private/caja-cell-renderer-text-ellipsized.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 'libcaja-private/caja-cell-renderer-text-ellipsized.c')
| -rw-r--r-- | libcaja-private/caja-cell-renderer-text-ellipsized.c | 34 |
1 files changed, 1 insertions, 33 deletions
diff --git a/libcaja-private/caja-cell-renderer-text-ellipsized.c b/libcaja-private/caja-cell-renderer-text-ellipsized.c index 414bdc9d..13d73f04 100644 --- a/libcaja-private/caja-cell-renderer-text-ellipsized.c +++ b/libcaja-private/caja-cell-renderer-text-ellipsized.c @@ -29,7 +29,6 @@ G_DEFINE_TYPE (CajaCellRendererTextEllipsized, caja_cell_renderer_text_ellipsized, GTK_TYPE_CELL_RENDERER_TEXT); -#if GTK_CHECK_VERSION(3,0,0) static void caja_cell_renderer_text_ellipsized_init (CajaCellRendererTextEllipsized *cell) { @@ -59,44 +58,13 @@ caja_cell_renderer_text_ellipsized_get_preferred_width (GtkCellRenderer *cell, "ellipsize-set", TRUE, NULL); } -#else /* GTK_CHECK_VERSION(3,0,0) */ -static void -caja_cell_renderer_text_ellipsized_init (CajaCellRendererTextEllipsized *cell) -{ - g_object_set (cell, "ellipsize", PANGO_ELLIPSIZE_END, NULL); -} - -static void -caja_cell_renderer_text_ellipsized_get_size (GtkCellRenderer *cell, - GtkWidget *widget, - GdkRectangle *cell_area, - gint *x_offset, - gint *y_offset, - gint *width, - gint *height) -{ - g_object_set (cell, "ellipsize", PANGO_ELLIPSIZE_NONE, NULL); - - GTK_CELL_RENDERER_CLASS - (caja_cell_renderer_text_ellipsized_parent_class)->get_size (cell, widget, - cell_area, - x_offset, y_offset, - width, height); - - g_object_set (cell, "ellipsize", PANGO_ELLIPSIZE_END, NULL); -} -#endif /* GTK_CHECK_VERSION(3,0,0) */ static void caja_cell_renderer_text_ellipsized_class_init (CajaCellRendererTextEllipsizedClass *klass) { GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (klass); - -#if GTK_CHECK_VERSION(3,0,0) cell_class->get_preferred_width = caja_cell_renderer_text_ellipsized_get_preferred_width; -#else - cell_class->get_size = caja_cell_renderer_text_ellipsized_get_size; -#endif + } GtkCellRenderer * |