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-gdk-extensions.h | |
| 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-gdk-extensions.h')
| -rw-r--r-- | eel/eel-gdk-extensions.h | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/eel/eel-gdk-extensions.h b/eel/eel-gdk-extensions.h index 0e8af740..b849af6b 100644 --- a/eel/eel-gdk-extensions.h +++ b/eel/eel-gdk-extensions.h @@ -102,30 +102,19 @@ char * eel_gradient_set_bottom_color_spec (const char /* A version of parse_color that substitutes a default color instead of returning a boolean to indicate it cannot be parsed. */ -#if GTK_CHECK_VERSION (3, 0, 0) void eel_gdk_rgba_parse_with_white_default (GdkRGBA *parsed_color, const char *color_spec); -#else -void eel_gdk_color_parse_with_white_default (const char *color_spec, - GdkColor *parsed_color); -#endif + guint32 eel_rgb16_to_rgb (gushort r, gushort g, gushort b); -#if GTK_CHECK_VERSION (3, 0, 0) guint32 eel_gdk_rgba_to_rgb (const GdkRGBA *color); GdkRGBA eel_gdk_rgb_to_rgba (guint32 color); -#else -guint32 eel_gdk_color_to_rgb (const GdkColor *color); -GdkColor eel_gdk_rgb_to_color (guint32 color); -#endif + char * eel_gdk_rgb_to_color_spec (guint32 color); -#if GTK_CHECK_VERSION(3,0,0) gboolean eel_gdk_rgba_is_dark (const GdkRGBA *color); -#else -gboolean eel_gdk_color_is_dark (GdkColor *color); -#endif + /* Wrapper for XParseGeometry */ EelGdkGeometryFlags eel_gdk_parse_geometry (const char *string, @@ -133,15 +122,11 @@ EelGdkGeometryFlags eel_gdk_parse_geometry (const char int *y_return, guint *width_return, guint *height_return); -#if GTK_CHECK_VERSION(3,0,0) + void eel_cairo_draw_layout_with_drop_shadow (cairo_t *cr, GdkRGBA *text_color, GdkRGBA *shadow_color, -#else -void eel_gdk_draw_layout_with_drop_shadow (GdkDrawable *drawable, - GdkColor *text_color, - GdkColor *shadow_color, -#endif + int x, int y, PangoLayout *layout); |