From d775caff7fb8030abc883391b29f748a5f432165 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 16 Oct 2022 20:59:38 -0400 Subject: Rename gtk_widget_get_style_color This name wasn't everybody's favorite, so go with the generic name gtk_widget_get_color() instead. --- gtk/deprecated/gtkstylecontext.c | 2 +- gtk/gtkwidget.c | 6 +++--- gtk/gtkwidget.h | 2 +- gtk/inspector/graphrenderer.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gtk/deprecated/gtkstylecontext.c b/gtk/deprecated/gtkstylecontext.c index d8f113f369..1ba9b9b2af 100644 --- a/gtk/deprecated/gtkstylecontext.c +++ b/gtk/deprecated/gtkstylecontext.c @@ -824,7 +824,7 @@ gtk_style_context_lookup_color (GtkStyleContext *context, * * Gets the foreground color for a given state. * - * Deprecated: 4.10: Use [method@Gtk.Widget.get_style_color] instead + * Deprecated: 4.10: Use [method@Gtk.Widget.get_color] instead */ void gtk_style_context_get_color (GtkStyleContext *context, diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index df62e32822..b57d8c340c 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -12871,7 +12871,7 @@ gtk_widget_set_css_classes (GtkWidget *widget, } /** - * gtk_widget_get_style_color: + * gtk_widget_get_color: * @widget: a `GtkWidget` * @color: (out): return location for the color * @@ -12885,8 +12885,8 @@ gtk_widget_set_css_classes (GtkWidget *widget, * Since: 4.10 */ void -gtk_widget_get_style_color (GtkWidget *widget, - GdkRGBA *color) +gtk_widget_get_color (GtkWidget *widget, + GdkRGBA *color) { GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget); GtkCssStyle *style; diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h index 04eec3f732..ffcab268c6 100644 --- a/gtk/gtkwidget.h +++ b/gtk/gtkwidget.h @@ -929,7 +929,7 @@ void gtk_widget_set_css_classes (GtkWidget *widget, const char **classes); GDK_AVAILABLE_IN_4_10 -void gtk_widget_get_style_color (GtkWidget *widget, +void gtk_widget_get_color (GtkWidget *widget, GdkRGBA *color); diff --git a/gtk/inspector/graphrenderer.c b/gtk/inspector/graphrenderer.c index 0fb1f0d427..cc79f8b5a9 100644 --- a/gtk/inspector/graphrenderer.c +++ b/gtk/inspector/graphrenderer.c @@ -153,7 +153,7 @@ graph_renderer_snapshot (GtkWidget *widget, diff = maximum - minimum; - gtk_widget_get_style_color (widget, &color); + gtk_widget_get_color (widget, &color); cr = gtk_snapshot_append_cairo (snapshot, &GRAPHENE_RECT_INIT ( -- cgit v1.2.1