diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2010-08-16 19:09:34 +0200 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@gnome.org> | 2010-12-04 15:37:37 +0100 |
| commit | 4781f94de258b9a3d6aa244626a30ffbbf529dfd (patch) | |
| tree | edaebce3224d6850a8f2655c58bc4260b1cf0a62 /gtk/gtkstylecontext.c | |
| parent | 2c7c4d9a513f8ddb80093cf7f2ed52095cc59b06 (diff) | |
| download | gtk+-4781f94de258b9a3d6aa244626a30ffbbf529dfd.tar.gz | |
Move all theming stack to use GtkStateFlags.
This support goes from the theming engines, which are able to retrieve
style for different combined states to the CSS provider, where several
state pseudo-classes may be specified, such as:
GtkButton:active:prelight {}
Diffstat (limited to 'gtk/gtkstylecontext.c')
| -rw-r--r-- | gtk/gtkstylecontext.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c index 41b607f34f..cd3b2c0276 100644 --- a/gtk/gtkstylecontext.c +++ b/gtk/gtkstylecontext.c @@ -343,7 +343,7 @@ rebuild_properties (GtkStyleContext *context) } } - gtk_style_set_get (priv->store, GTK_STATE_NORMAL, + gtk_style_set_get (priv->store, 0, "engine", &priv->theming_engine, NULL); } @@ -488,14 +488,13 @@ gtk_style_context_remove_provider (GtkStyleContext *context, void gtk_style_context_get_property (GtkStyleContext *context, const gchar *property, - GtkStateType state, + GtkStateFlags state, GValue *value) { GtkStyleContextPrivate *priv; g_return_if_fail (GTK_IS_STYLE_CONTEXT (context)); g_return_if_fail (property != NULL); - g_return_if_fail (state < GTK_STATE_LAST); g_return_if_fail (value != NULL); priv = context->priv; @@ -504,13 +503,12 @@ gtk_style_context_get_property (GtkStyleContext *context, void gtk_style_context_get_valist (GtkStyleContext *context, - GtkStateType state, + GtkStateFlags state, va_list args) { GtkStyleContextPrivate *priv; g_return_if_fail (GTK_IS_STYLE_CONTEXT (context)); - g_return_if_fail (state < GTK_STATE_LAST); priv = context->priv; gtk_style_set_get_valist (priv->store, state, args); @@ -518,14 +516,13 @@ gtk_style_context_get_valist (GtkStyleContext *context, void gtk_style_context_get (GtkStyleContext *context, - GtkStateType state, + GtkStateFlags state, ...) { GtkStyleContextPrivate *priv; va_list args; g_return_if_fail (GTK_IS_STYLE_CONTEXT (context)); - g_return_if_fail (state < GTK_STATE_LAST); priv = context->priv; |