diff options
| author | Benjamin Otte <otte@redhat.com> | 2012-03-17 02:36:11 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2012-04-17 08:59:07 +0200 |
| commit | a94b85d37592cb9119216cd9f4820e27edfe5e15 (patch) | |
| tree | 47ad100f777ac9f52fe977eb3f5264e173f1ad82 /gtk/gtkstylecascade.c | |
| parent | c0b7c3321d15daf05a26818745367051300ac176 (diff) | |
| download | gtk+-a94b85d37592cb9119216cd9f4820e27edfe5e15.tar.gz | |
css: Make the style provider take a matcher as an input argument
Diffstat (limited to 'gtk/gtkstylecascade.c')
| -rw-r--r-- | gtk/gtkstylecascade.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/gtk/gtkstylecascade.c b/gtk/gtkstylecascade.c index 0c427ce819..f1bf516125 100644 --- a/gtk/gtkstylecascade.c +++ b/gtk/gtkstylecascade.c @@ -173,8 +173,7 @@ gtk_style_cascade_get_color (GtkStyleProviderPrivate *provider, static void gtk_style_cascade_lookup (GtkStyleProviderPrivate *provider, - GtkWidgetPath *path, - GtkStateFlags state, + const GtkCssMatcher *matcher, GtkCssLookup *lookup) { GtkStyleCascade *cascade = GTK_STYLE_CASCADE (provider); @@ -188,22 +187,13 @@ gtk_style_cascade_lookup (GtkStyleProviderPrivate *provider, if (GTK_IS_STYLE_PROVIDER_PRIVATE (item)) { _gtk_style_provider_private_lookup (GTK_STYLE_PROVIDER_PRIVATE (item), - path, - state, + matcher, lookup); } else { - GtkStyleProperties *provider_style = gtk_style_provider_get_style (item, path); - - if (provider_style) - { - _gtk_style_provider_private_lookup (GTK_STYLE_PROVIDER_PRIVATE (provider_style), - path, - state, - lookup); - g_object_unref (provider_style); - } + /* you lose */ + g_warn_if_reached (); } } } |