diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt index 39bcade5e6..742147f7c0 100644 --- a/docs/reference/gtk/gtk4-sections.txt +++ b/docs/reference/gtk/gtk4-sections.txt @@ -1044,8 +1044,6 @@ gtk_expander_set_use_markup gtk_expander_get_use_markup gtk_expander_set_label_widget gtk_expander_get_label_widget -gtk_expander_set_label_fill -gtk_expander_get_label_fill gtk_expander_set_resize_toplevel gtk_expander_get_resize_toplevel diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c index 1756682561..e27bfab98f 100644 --- a/gtk/gtkexpander.c +++ b/gtk/gtkexpander.c @@ -141,7 +141,6 @@ enum PROP_USE_UNDERLINE, PROP_USE_MARKUP, PROP_LABEL_WIDGET, - PROP_LABEL_FILL, PROP_RESIZE_TOPLEVEL }; @@ -161,7 +160,6 @@ struct _GtkExpanderPrivate guint expanded : 1; guint use_underline : 1; guint use_markup : 1; - guint label_fill : 1; guint resize_toplevel : 1; }; @@ -308,14 +306,6 @@ gtk_expander_class_init (GtkExpanderClass *klass) GTK_TYPE_WIDGET, GTK_PARAM_READWRITE)); - g_object_class_install_property (gobject_class, - PROP_LABEL_FILL, - g_param_spec_boolean ("label-fill", - P_("Label fill"), - P_("Whether the label widget should fill all available horizontal space"), - FALSE, - GTK_PARAM_READWRITE|G_PARAM_CONSTRUCT|G_PARAM_EXPLICIT_NOTIFY)); - /** * GtkExpander:resize-toplevel: * @@ -359,7 +349,6 @@ gtk_expander_init (GtkExpander *expander) priv->expanded = FALSE; priv->use_underline = FALSE; priv->use_markup = FALSE; - priv->label_fill = FALSE; priv->expand_timer = 0; priv->resize_toplevel = 0; @@ -435,9 +424,6 @@ gtk_expander_set_property (GObject *object, case PROP_LABEL_WIDGET: gtk_expander_set_label_widget (expander, g_value_get_object (value)); break; - case PROP_LABEL_FILL: - gtk_expander_set_label_fill (expander, g_value_get_boolean (value)); - break; case PROP_RESIZE_TOPLEVEL: gtk_expander_set_resize_toplevel (expander, g_value_get_boolean (value)); break; @@ -475,9 +461,6 @@ gtk_expander_get_property (GObject *object, priv->label_widget ? G_OBJECT (priv->label_widget) : NULL); break; - case PROP_LABEL_FILL: - g_value_set_boolean (value, priv->label_fill); - break; case PROP_RESIZE_TOPLEVEL: g_value_set_boolean (value, gtk_expander_get_resize_toplevel (expander)); break; @@ -1200,56 +1183,6 @@ gtk_expander_get_label_widget (GtkExpander *expander) return expander->priv->label_widget; } -/** - * gtk_expander_set_label_fill: - * @expander: a #GtkExpander - * @label_fill: %TRUE if the label should should fill - * all available horizontal space - * - * Sets whether the label widget should fill all available - * horizontal space allocated to @expander. - */ -void -gtk_expander_set_label_fill (GtkExpander *expander, - gboolean label_fill) -{ - GtkExpanderPrivate *priv; - - g_return_if_fail (GTK_IS_EXPANDER (expander)); - - priv = expander->priv; - - label_fill = label_fill != FALSE; - - if (priv->label_fill != label_fill) - { - priv->label_fill = label_fill; - - if (priv->label_widget != NULL) - gtk_widget_queue_resize (GTK_WIDGET (expander)); - - g_object_notify (G_OBJECT (expander), "label-fill"); - } -} - -/** - * gtk_expander_get_label_fill: - * @expander: a #GtkExpander - * - * Returns whether the label widget will fill all available - * horizontal space allocated to @expander. - * - * Returns: %TRUE if the label widget will fill all - * available horizontal space - */ -gboolean -gtk_expander_get_label_fill (GtkExpander *expander) -{ - g_return_val_if_fail (GTK_IS_EXPANDER (expander), FALSE); - - return expander->priv->label_fill; -} - /** * gtk_expander_set_resize_toplevel: * @expander: a #GtkExpander diff --git a/gtk/gtkexpander.h b/gtk/gtkexpander.h index bed7a81ec2..18d425f9b3 100644 --- a/gtk/gtkexpander.h +++ b/gtk/gtkexpander.h @@ -111,11 +111,6 @@ void gtk_expander_set_label_widget (GtkExpander *expander, GDK_AVAILABLE_IN_ALL GtkWidget *gtk_expander_get_label_widget (GtkExpander *expander); GDK_AVAILABLE_IN_ALL -void gtk_expander_set_label_fill (GtkExpander *expander, - gboolean label_fill); -GDK_AVAILABLE_IN_ALL -gboolean gtk_expander_get_label_fill (GtkExpander *expander); -GDK_AVAILABLE_IN_ALL void gtk_expander_set_resize_toplevel (GtkExpander *expander, gboolean resize_toplevel); GDK_AVAILABLE_IN_ALL