From 7ea1badd8a6e61d727ca7353dd5d34d2735bf067 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Tue, 8 Mar 2011 20:56:37 -0500 Subject: Bug 644235 - Make EActivityProxy a GtkFrame So it can inherit the theme from the widget below. Was previously a GtkEventBox for historical reasons that no one remembers. --- widgets/misc/e-activity-proxy.c | 11 +++-------- widgets/misc/e-activity-proxy.h | 4 ++-- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/widgets/misc/e-activity-proxy.c b/widgets/misc/e-activity-proxy.c index d52451fa37..91dd5765ea 100644 --- a/widgets/misc/e-activity-proxy.c +++ b/widgets/misc/e-activity-proxy.c @@ -47,7 +47,7 @@ enum { G_DEFINE_TYPE ( EActivityProxy, e_activity_proxy, - GTK_TYPE_EVENT_BOX) + GTK_TYPE_FRAME) static void activity_proxy_feedback (EActivityProxy *proxy) @@ -262,14 +262,9 @@ e_activity_proxy_init (EActivityProxy *proxy) proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE ( proxy, E_TYPE_ACTIVITY_PROXY, EActivityProxyPrivate); - container = GTK_WIDGET (proxy); - - widget = gtk_frame_new (NULL); - gtk_frame_set_shadow_type (GTK_FRAME (widget), GTK_SHADOW_IN); - gtk_container_add (GTK_CONTAINER (container), widget); - gtk_widget_show (widget); + gtk_frame_set_shadow_type (GTK_FRAME (proxy), GTK_SHADOW_IN); - container = widget; + container = GTK_WIDGET (proxy); widget = gtk_hbox_new (FALSE, 3); gtk_container_add (GTK_CONTAINER (container), widget); diff --git a/widgets/misc/e-activity-proxy.h b/widgets/misc/e-activity-proxy.h index cb44d6b025..975cd6ff05 100644 --- a/widgets/misc/e-activity-proxy.h +++ b/widgets/misc/e-activity-proxy.h @@ -51,12 +51,12 @@ typedef struct _EActivityProxyClass EActivityProxyClass; typedef struct _EActivityProxyPrivate EActivityProxyPrivate; struct _EActivityProxy { - GtkEventBox parent; + GtkFrame parent; EActivityProxyPrivate *priv; }; struct _EActivityProxyClass { - GtkEventBoxClass parent_class; + GtkFrameClass parent_class; }; GType e_activity_proxy_get_type (void); -- cgit v1.2.3