summaryrefslogtreecommitdiff
path: root/gtk/gtkcssstaticstyle.c
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2017-10-31 04:31:46 +0100
committerBenjamin Otte <otte@redhat.com>2017-10-31 04:33:54 +0100
commit83fb7a649f07fc989ff149036b17698f7dee18c4 (patch)
tree772d5c0ac1a4ee7054cef63e6f675fdbeebc081f /gtk/gtkcssstaticstyle.c
parentc8986e66ce482714f4ce2adf3c24dd53cca27bbe (diff)
downloadgtk+-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/gtkcssstaticstyle.c')
-rw-r--r--gtk/gtkcssstaticstyle.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/gtk/gtkcssstaticstyle.c b/gtk/gtkcssstaticstyle.c
index f8ce97003d..57b6723d23 100644
--- a/gtk/gtkcssstaticstyle.c
+++ b/gtk/gtkcssstaticstyle.c
@@ -155,7 +155,7 @@ gtk_css_static_style_get_default (void)
GtkSettings *settings;
settings = gtk_settings_get_default ();
- default_style = gtk_css_static_style_new_compute (GTK_STYLE_PROVIDER_PRIVATE (settings),
+ default_style = gtk_css_static_style_new_compute (GTK_STYLE_PROVIDER (settings),
NULL,
NULL);
g_object_set_data_full (G_OBJECT (settings), "gtk-default-style",
@@ -166,9 +166,9 @@ gtk_css_static_style_get_default (void)
}
GtkCssStyle *
-gtk_css_static_style_new_compute (GtkStyleProviderPrivate *provider,
- const GtkCssMatcher *matcher,
- GtkCssStyle *parent)
+gtk_css_static_style_new_compute (GtkStyleProvider *provider,
+ const GtkCssMatcher *matcher,
+ GtkCssStyle *parent)
{
GtkCssStaticStyle *result;
GtkCssLookup *lookup;
@@ -177,10 +177,10 @@ gtk_css_static_style_new_compute (GtkStyleProviderPrivate *provider,
lookup = _gtk_css_lookup_new (NULL);
if (matcher)
- _gtk_style_provider_private_lookup (provider,
- matcher,
- lookup,
- &change);
+ gtk_style_provider_lookup (provider,
+ matcher,
+ lookup,
+ &change);
result = g_object_new (GTK_TYPE_CSS_STATIC_STYLE, NULL);
@@ -197,12 +197,12 @@ gtk_css_static_style_new_compute (GtkStyleProviderPrivate *provider,
}
void
-gtk_css_static_style_compute_value (GtkCssStaticStyle *style,
- GtkStyleProviderPrivate *provider,
- GtkCssStyle *parent_style,
- guint id,
- GtkCssValue *specified,
- GtkCssSection *section)
+gtk_css_static_style_compute_value (GtkCssStaticStyle *style,
+ GtkStyleProvider *provider,
+ GtkCssStyle *parent_style,
+ guint id,
+ GtkCssValue *specified,
+ GtkCssSection *section)
{
GtkCssValue *value;