diff options
| author | Benjamin Otte <otte@redhat.com> | 2014-06-16 04:28:06 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2014-08-16 19:39:44 +0200 |
| commit | 04bf3d1e1fc231275d876b4f472b804f66712618 (patch) | |
| tree | 267bd677557628073c939802c0c5999e1263408c /gtk/gtkroundedbox.c | |
| parent | 5e8d3d533fc9e33d902fbef5c7e4560bb38d7dcf (diff) | |
| download | gtk+-04bf3d1e1fc231275d876b4f472b804f66712618.tar.gz | |
roundedbox: Remove functions that take a GtkThemingEngine
Instead, make the functions use a GtkStyleContext argument.
Diffstat (limited to 'gtk/gtkroundedbox.c')
| -rw-r--r-- | gtk/gtkroundedbox.c | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/gtk/gtkroundedbox.c b/gtk/gtkroundedbox.c index 5aa53def2a..c3e2650e4c 100644 --- a/gtk/gtkroundedbox.c +++ b/gtk/gtkroundedbox.c @@ -22,7 +22,6 @@ #include "gtkcsscornervalueprivate.h" #include "gtkcsstypesprivate.h" #include "gtkstylecontextprivate.h" -#include "gtkthemingengineprivate.h" #include <string.h> @@ -131,24 +130,16 @@ _gtk_rounded_box_apply_border_radius_for_context (GtkRoundedBox *box, } void -_gtk_rounded_box_apply_border_radius_for_engine (GtkRoundedBox *box, - GtkThemingEngine *engine, - GtkJunctionSides junction) -{ - _gtk_rounded_box_apply_border_radius_for_context (box, _gtk_theming_engine_get_context (engine), junction); -} - -void -_gtk_rounded_box_apply_outline_radius_for_engine (GtkRoundedBox *box, - GtkThemingEngine *engine, - GtkJunctionSides junction) +_gtk_rounded_box_apply_outline_radius_for_context (GtkRoundedBox *box, + GtkStyleContext *context, + GtkJunctionSides junction) { GtkCssValue *corner[4]; - corner[GTK_CSS_TOP_LEFT] = _gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_OUTLINE_TOP_LEFT_RADIUS); - corner[GTK_CSS_TOP_RIGHT] = _gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_OUTLINE_TOP_RIGHT_RADIUS); - corner[GTK_CSS_BOTTOM_LEFT] = _gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_OUTLINE_BOTTOM_LEFT_RADIUS); - corner[GTK_CSS_BOTTOM_RIGHT] = _gtk_theming_engine_peek_property (engine, GTK_CSS_PROPERTY_OUTLINE_BOTTOM_RIGHT_RADIUS); + corner[GTK_CSS_TOP_LEFT] = _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_OUTLINE_TOP_LEFT_RADIUS); + corner[GTK_CSS_TOP_RIGHT] = _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_OUTLINE_TOP_RIGHT_RADIUS); + corner[GTK_CSS_BOTTOM_LEFT] = _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_OUTLINE_BOTTOM_LEFT_RADIUS); + corner[GTK_CSS_BOTTOM_RIGHT] = _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_OUTLINE_BOTTOM_RIGHT_RADIUS); _gtk_rounded_box_apply_border_radius (box, corner, junction); } |