Rename gtk_widget_get_style_color

This name wasn't everybody's favorite, so go with
the generic name gtk_widget_get_color() instead.

diff --git a/gtk/deprecated/gtkstylecontext.c b/gtk/deprecated/gtkstylecontext.c
index d8f113f3698c409ff618638a9944d4c0708fa4ef..1ba9b9b2afb82d9df4ecbbad937f743f96c05f7b 100644 (file)
--- 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 df62e32822427fdf550c83d43336bfca5b0cd182..b57d8c340c7a85bc74aebd16f2ee1f4fe991963e 100644 (file)
--- 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 04eec3f732c5d80a2c87156b8182b13362af2ea5..ffcab268c63ae02d76f5676ebab9d416e2b9be7b 100644 (file)
--- 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 0fb1f0d427dc71a98b34bc3394ea6b445c0321f0..cc79f8b5a99f25e15e2439dd3bde4563d47e12f9 100644 (file)
--- 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 (