summaryrefslogtreecommitdiff
path: root/libcaja-private/caja-icon-private.h
diff options
context:
space:
mode:
authorlukefromdc <[email protected]>2016-11-22 15:02:51 -0500
committerlukefromdc <[email protected]>2016-11-22 15:02:51 -0500
commit276eb145ce96d5f75f8d3901daf6310f60ddbb81 (patch)
tree544f41e76c9a91973867065696fc2e414ca60170 /libcaja-private/caja-icon-private.h
parent969e4d021fe49654fe6e5ee7e88c920fec126505 (diff)
downloadcaja-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-icon-private.h')
-rw-r--r--libcaja-private/caja-icon-private.h22
1 files changed, 1 insertions, 21 deletions
diff --git a/libcaja-private/caja-icon-private.h b/libcaja-private/caja-icon-private.h
index 9364bab7..de74cba4 100644
--- a/libcaja-private/caja-icon-private.h
+++ b/libcaja-private/caja-icon-private.h
@@ -210,19 +210,6 @@ struct CajaIconContainerDetails
/* font sizes used to draw labels */
int font_size_table[CAJA_ZOOM_LEVEL_LARGEST + 1];
- /* pixbuf and color for label highlighting */
-#if !GTK_CHECK_VERSION(3,0,0)
- guint32 highlight_color_rgba;
- guint32 active_color_rgba;
- guint32 normal_color_rgba;
- guint32 prelight_color_rgba;
- guint32 prelight_icon_color_rgba;
- guint32 normal_icon_color_rgba;
-
- /* colors for text labels */
- GdkColor label_colors [LAST_LABEL_COLOR];
-#endif
-
/* State used so arrow keys don't wander if icons aren't lined up.
*/
int arrow_key_start_x;
@@ -327,13 +314,6 @@ 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,
- GdkColor **color,
- gboolean first_line,
- gboolean needs_highlight,
- gboolean is_prelit);
-#endif
+
#endif /* CAJA_ICON_CONTAINER_PRIVATE_H */