diff options
| author | Tim Janik <timj@gtk.org> | 2001-09-10 18:54:20 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 2001-09-10 18:54:20 +0000 |
| commit | 91aa2d9234ebcee442f69c0d39baae4730129128 (patch) | |
| tree | 15cf0148285207f9e99ffb5a40edac8c955b9844 /gtk | |
| parent | ff872aefee1901342111556f774c86234e759923 (diff) | |
| download | gtk+-91aa2d9234ebcee442f69c0d39baae4730129128.tar.gz | |
slight fix for g_object_set() not usable for nesting anymore.
Mon Sep 10 20:47:22 2001 Tim Janik <timj@gtk.org>
* tests/testgtk.c (create_idle_test): slight fix for
g_object_set() not usable for nesting anymore.
* gtk/gtkhandlebox.c (gtk_handle_box_class_init):
* gtk/gtkframe.c (gtk_frame_class_init): deprecate ::shadow
properties, supply ::shadow_type properties instead as most
other widgets do.
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkframe.c | 14 | ||||
| -rw-r--r-- | gtk/gtkhandlebox.c | 14 |
2 files changed, 24 insertions, 4 deletions
diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c index 98dfc509a6..7efc069a52 100644 --- a/gtk/gtkframe.c +++ b/gtk/gtkframe.c @@ -38,6 +38,7 @@ enum { PROP_LABEL_XALIGN, PROP_LABEL_YALIGN, PROP_SHADOW, + PROP_SHADOW_TYPE, PROP_LABEL_WIDGET }; @@ -148,7 +149,14 @@ gtk_frame_class_init (GtkFrameClass *class) G_PARAM_WRITABLE)); g_object_class_install_property (gobject_class, PROP_SHADOW, - g_param_spec_enum ("shadow", + g_param_spec_enum ("shadow", NULL, + _("Deprecated property, use shadow_type instead."), + GTK_TYPE_SHADOW_TYPE, + GTK_SHADOW_ETCHED_IN, + G_PARAM_READABLE | G_PARAM_WRITABLE)); + g_object_class_install_property (gobject_class, + PROP_SHADOW_TYPE, + g_param_spec_enum ("shadow_type", _("Frame shadow"), _("Appearance of the frame border."), GTK_TYPE_SHADOW_TYPE, @@ -206,6 +214,7 @@ gtk_frame_set_property (GObject *object, g_value_get_double (value)); break; case PROP_SHADOW: + case PROP_SHADOW_TYPE: gtk_frame_set_shadow_type (frame, g_value_get_enum (value)); break; case PROP_LABEL_WIDGET: @@ -239,6 +248,7 @@ gtk_frame_get_property (GObject *object, g_value_set_double (value, frame->label_yalign); break; case PROP_SHADOW: + case PROP_SHADOW_TYPE: g_value_set_enum (value, frame->shadow_type); break; case PROP_LABEL_WIDGET: @@ -453,7 +463,7 @@ gtk_frame_set_shadow_type (GtkFrame *frame, if ((GtkShadowType) frame->shadow_type != type) { frame->shadow_type = type; - g_object_notify (G_OBJECT (frame), "shadow"); + g_object_notify (G_OBJECT (frame), "shadow_type"); if (GTK_WIDGET_DRAWABLE (frame)) { diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c index 852a184040..3a773269bf 100644 --- a/gtk/gtkhandlebox.c +++ b/gtk/gtkhandlebox.c @@ -35,6 +35,7 @@ enum { PROP_0, PROP_SHADOW, + PROP_SHADOW_TYPE, PROP_HANDLE_POSITION, PROP_SNAP_EDGE }; @@ -179,7 +180,14 @@ gtk_handle_box_class_init (GtkHandleBoxClass *class) g_object_class_install_property (gobject_class, PROP_SHADOW, - g_param_spec_enum ("shadow", + g_param_spec_enum ("shadow", NULL, + _("Deprecated property, use shadow_type instead."), + GTK_TYPE_SHADOW_TYPE, + GTK_SHADOW_ETCHED_OUT, + G_PARAM_READABLE | G_PARAM_WRITABLE)); + g_object_class_install_property (gobject_class, + PROP_SHADOW_TYPE, + g_param_spec_enum ("shadow_type", _("Shadow type"), _("Appearance of the shadow that surrounds the container."), GTK_TYPE_SHADOW_TYPE, @@ -269,6 +277,7 @@ gtk_handle_box_set_property (GObject *object, switch (prop_id) { case PROP_SHADOW: + case PROP_SHADOW_TYPE: gtk_handle_box_set_shadow_type (handle_box, g_value_get_enum (value)); break; case PROP_HANDLE_POSITION: @@ -294,6 +303,7 @@ gtk_handle_box_get_property (GObject *object, switch (prop_id) { case PROP_SHADOW: + case PROP_SHADOW_TYPE: g_value_set_enum (value, handle_box->shadow_type); break; case PROP_HANDLE_POSITION: @@ -733,7 +743,7 @@ gtk_handle_box_set_shadow_type (GtkHandleBox *handle_box, if ((GtkShadowType) handle_box->shadow_type != type) { handle_box->shadow_type = type; - g_object_notify (G_OBJECT (handle_box), "shadow"); + g_object_notify (G_OBJECT (handle_box), "shadow_type"); gtk_widget_queue_resize (GTK_WIDGET (handle_box)); } } |