diff options
| author | Wolfgang Ulbrich <[email protected]> | 2016-01-11 15:08:16 +0100 |
|---|---|---|
| committer | Wolfgang Ulbrich <[email protected]> | 2016-01-13 15:07:34 +0100 |
| commit | 5ec02960d6f78dd23b02af27e6f3c595ab4e99bc (patch) | |
| tree | 9ecd16a5ba69be08aa8a354ab3e962d110fd820c /libcaja-private/caja-icon-private.h | |
| parent | e9ecff6c51b4e84fc350ccfe972439ed8dbe7215 (diff) | |
| download | caja-5ec02960d6f78dd23b02af27e6f3c595ab4e99bc.tar.bz2 caja-5ec02960d6f78dd23b02af27e6f3c595ab4e99bc.tar.xz | |
GTK3 icon-container: remove unused code caching canvas item colors
Caching colors in CajaIconContainer to use them in the canvas item
is not needed anymore, as gtk_render_* fetches the right values directly
from the style context.
taken from:
https://git.gnome.org/browse/nautilus/commit/?id=77eecef
Diffstat (limited to 'libcaja-private/caja-icon-private.h')
| -rw-r--r-- | libcaja-private/caja-icon-private.h | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/libcaja-private/caja-icon-private.h b/libcaja-private/caja-icon-private.h index e044ca75..9364bab7 100644 --- a/libcaja-private/caja-icon-private.h +++ b/libcaja-private/caja-icon-private.h @@ -211,15 +211,7 @@ struct CajaIconContainerDetails int font_size_table[CAJA_ZOOM_LEVEL_LARGEST + 1]; /* pixbuf and color for label highlighting */ -#if GTK_CHECK_VERSION(3,0,0) - GdkRGBA highlight_color_rgba; - GdkRGBA active_color_rgba; - GdkRGBA normal_color_rgba; - GdkRGBA prelight_color_rgba; - - /* colors for text labels */ - GdkRGBA label_colors [LAST_LABEL_COLOR]; -#else +#if !GTK_CHECK_VERSION(3,0,0) guint32 highlight_color_rgba; guint32 active_color_rgba; guint32 normal_color_rgba; @@ -335,15 +327,13 @@ gboolean caja_icon_container_scroll (CajaIconContainer int delta_y); void caja_icon_container_update_scroll_region (CajaIconContainer *container); +#if !GTK_CHECK_VERSION(3,0,0) /* label color for items */ void caja_icon_container_get_label_color (CajaIconContainer *container, -#if GTK_CHECK_VERSION(3,0,0) - GdkRGBA *color, -#else GdkColor **color, -#endif gboolean first_line, gboolean needs_highlight, gboolean is_prelit); +#endif #endif /* CAJA_ICON_CONTAINER_PRIVATE_H */ |