diff options
| author | Wolfgang Ulbrich <[email protected]> | 2016-01-09 01:14:42 +0100 |
|---|---|---|
| committer | Wolfgang Ulbrich <[email protected]> | 2016-01-13 15:05:42 +0100 |
| commit | e2942ccb6206376293044bf0f7c885505e6a1113 (patch) | |
| tree | 06a24bbb6525925fc23eebe014f084efbf1d4a7b /libcaja-private/caja-icon-container.c | |
| parent | b03a4c4078440f3ec1baea7ea158606f3c68e277 (diff) | |
| download | caja-e2942ccb6206376293044bf0f7c885505e6a1113.tar.bz2 caja-e2942ccb6206376293044bf0f7c885505e6a1113.tar.xz | |
GTK3 icon-container: hook to style_updated instead of style_set
taken from:
https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=a083fa0
Diffstat (limited to 'libcaja-private/caja-icon-container.c')
| -rw-r--r-- | libcaja-private/caja-icon-container.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c index 93af49bc..fa93bf1e 100644 --- a/libcaja-private/caja-icon-container.c +++ b/libcaja-private/caja-icon-container.c @@ -4643,19 +4643,24 @@ unrealize (GtkWidget *widget) } static void +#if GTK_CHECK_VERSION(3,0,0) +style_updated (GtkWidget *widget) +{ + CajaIconContainer *container; + + GTK_WIDGET_CLASS (caja_icon_container_parent_class)->style_updated (widget); + + container = CAJA_ICON_CONTAINER (widget); + container->details->use_drop_shadows = container->details->drop_shadows_requested; +#else style_set (GtkWidget *widget, GtkStyle *previous_style) { CajaIconContainer *container; -#if !GTK_CHECK_VERSION(3,0,0) gboolean frame_text; -#endif container = CAJA_ICON_CONTAINER (widget); -#if GTK_CHECK_VERSION(3,0,0) - container->details->use_drop_shadows = container->details->drop_shadows_requested; -#else gtk_widget_style_get (GTK_WIDGET (container), "frame_text", &frame_text, NULL); @@ -6622,8 +6627,10 @@ caja_icon_container_class_init (CajaIconContainerClass *class) widget_class->key_press_event = key_press_event; widget_class->popup_menu = popup_menu; widget_class->get_accessible = get_accessible; +#if GTK_CHECK_VERSION(3,0,0) + widget_class->style_updated = style_updated; +#else widget_class->style_set = style_set; -#if !GTK_CHECK_VERSION(3,0,0) widget_class->expose_event = expose_event; #endif widget_class->grab_notify = grab_notify_cb; |