diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt index e3e9f10735..9235e93065 100644 --- a/docs/reference/gtk/gtk4-sections.txt +++ b/docs/reference/gtk/gtk4-sections.txt @@ -5123,7 +5123,6 @@ gtk_widget_shape_combine_region gtk_widget_input_shape_combine_region gtk_widget_path gtk_widget_class_path -gtk_widget_get_composite_name gtk_widget_override_background_color gtk_widget_override_color gtk_widget_override_font @@ -5153,7 +5152,6 @@ gtk_widget_queue_draw_region gtk_widget_set_app_paintable gtk_widget_set_double_buffered gtk_widget_set_redraw_on_allocate -gtk_widget_set_composite_name gtk_widget_mnemonic_activate gtk_widget_class_install_style_property gtk_widget_class_install_style_property_parser diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 431b62071e..4782f3e998 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -11094,63 +11094,6 @@ gtk_widget_is_ancestor (GtkWidget *widget, return FALSE; } -static GQuark quark_composite_name = 0; - -/** - * gtk_widget_set_composite_name: - * @widget: a #GtkWidget. - * @name: the name to set - * - * Sets a widgets composite name. The widget must be - * a composite child of its parent; see gtk_widget_push_composite_child(). - * - * Deprecated: 3.10: Use gtk_widget_class_set_template(), or don’t use this API at all. - **/ -void -gtk_widget_set_composite_name (GtkWidget *widget, - const gchar *name) -{ - g_return_if_fail (GTK_IS_WIDGET (widget)); - g_return_if_fail (widget->priv->composite_child); - g_return_if_fail (name != NULL); - - if (!quark_composite_name) - quark_composite_name = g_quark_from_static_string ("gtk-composite-name"); - - g_object_set_qdata_full (G_OBJECT (widget), - quark_composite_name, - g_strdup (name), - g_free); -} - -/** - * gtk_widget_get_composite_name: - * @widget: a #GtkWidget - * - * Obtains the composite name of a widget. - * - * Returns: the composite name of @widget, or %NULL if @widget is not - * a composite child. The string should be freed when it is no - * longer needed. - * - * Deprecated: 3.10: Use gtk_widget_class_set_template(), or don’t use this API at all. - **/ -gchar* -gtk_widget_get_composite_name (GtkWidget *widget) -{ - GtkWidgetPrivate *priv; - - g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); - - priv = widget->priv; - - if (widget->priv->composite_child && priv->parent) - return _gtk_container_child_composite_name (GTK_CONTAINER (priv->parent), - widget); - else - return NULL; -} - /** * gtk_widget_push_composite_child: * diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h index b6c2a9373b..8e773f11c3 100644 --- a/gtk/gtkwidget.h +++ b/gtk/gtkwidget.h @@ -1145,15 +1145,6 @@ GdkPixbuf *gtk_widget_render_icon_pixbuf (GtkWidget *widget, const gchar *stock_id, GtkIconSize size); -/* handle composite names for GTK_COMPOSITE_CHILD widgets, - * the returned name is newly allocated. - */ -GDK_DEPRECATED_IN_3_10_FOR(gtk_widget_class_set_template) -void gtk_widget_set_composite_name (GtkWidget *widget, - const gchar *name); -GDK_DEPRECATED_IN_3_10_FOR(gtk_widget_class_set_template) -gchar* gtk_widget_get_composite_name (GtkWidget *widget); - /* Push/pop pairs, to change default values upon a widget's creation. * This will override the values that got set by the * gtk_widget_set_default_* () functions.