diff options
| author | Benjamin Otte <otte@redhat.com> | 2017-10-31 04:31:46 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2017-10-31 04:33:54 +0100 |
| commit | 83fb7a649f07fc989ff149036b17698f7dee18c4 (patch) | |
| tree | 772d5c0ac1a4ee7054cef63e6f675fdbeebc081f /gtk/gtkstylecontext.c | |
| parent | c8986e66ce482714f4ce2adf3c24dd53cca27bbe (diff) | |
| download | gtk+-83fb7a649f07fc989ff149036b17698f7dee18c4.tar.gz | |
css: Merge GtkStyleProviderPrivate into GtkStyleProvider
This is just lots of renaming.
The interface remains private, so the public API does not change, apart
from removing the definition of the Interface object to avoid
subclassing.
Diffstat (limited to 'gtk/gtkstylecontext.c')
| -rw-r--r-- | gtk/gtkstylecontext.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c index 24d35e0561..fbe2e6af5c 100644 --- a/gtk/gtkstylecontext.c +++ b/gtk/gtkstylecontext.c @@ -409,12 +409,12 @@ gtk_style_context_get_root (GtkStyleContext *context) return priv->cssnode; } -GtkStyleProviderPrivate * +GtkStyleProvider * gtk_style_context_get_style_provider (GtkStyleContext *context) { GtkStyleContextPrivate *priv = gtk_style_context_get_instance_private (context); - return GTK_STYLE_PROVIDER_PRIVATE (priv->cascade); + return GTK_STYLE_PROVIDER (priv->cascade); } static gboolean @@ -1451,7 +1451,7 @@ _gtk_style_context_resolve_color (GtkStyleContext *context, g_return_val_if_fail (result != NULL, FALSE); val = _gtk_css_color_value_resolve (color, - GTK_STYLE_PROVIDER_PRIVATE (priv->cascade), + GTK_STYLE_PROVIDER (priv->cascade), _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_COLOR), NULL); if (val == NULL) @@ -1484,7 +1484,7 @@ gtk_style_context_lookup_color (GtkStyleContext *context, g_return_val_if_fail (color_name != NULL, FALSE); g_return_val_if_fail (color != NULL, FALSE); - value = _gtk_style_provider_private_get_color (GTK_STYLE_PROVIDER_PRIVATE (priv->cascade), color_name); + value = gtk_style_provider_get_color (GTK_STYLE_PROVIDER (priv->cascade), color_name); if (value == NULL) return FALSE; |