callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

themingbackground: Remove initializer that takes a GtkThemingEngine

Browse Source 
With the unification to use style contexts everywhere, make that
initializer the only one to use.

Also rename it appropriately.
This commit is contained in:
Benjamin Otte
2014-06-16 04:22:50 +02:00
parent 7e5b58c727
commit 5e8d3d533f
4 changed files with 17 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/gtkcolorswatch.c
View File

@ -126,9 +126,9 @@ swatch_draw (GtkWidget *widget,
gtk_style_context_save (context);
gtk_style_context_set_state (context, state);
_gtk_theming_background_init_from_context (&background, context,
0, 0, width, height,
GTK_JUNCTION_NONE);
_gtk_theming_background_init (&background, context,
0, 0, width, height,
GTK_JUNCTION_NONE);
if (swatch->priv->has_color)
{
@ -195,10 +195,10 @@ swatch_draw (GtkWidget *widget,
GIcon *gicon;
gtk_style_context_add_class (context, "color-active-badge");
_gtk_theming_background_init_from_context (&background, context,
(width - 2 * ACTIVE_BADGE_RADIUS) / 2, (height - 2 * ACTIVE_BADGE_RADIUS) / 2,
2 * ACTIVE_BADGE_RADIUS, 2* ACTIVE_BADGE_RADIUS,
GTK_JUNCTION_NONE);
_gtk_theming_background_init (&background, context,
(width - 2 * ACTIVE_BADGE_RADIUS) / 2, (height - 2 * ACTIVE_BADGE_RADIUS) / 2,
2 * ACTIVE_BADGE_RADIUS, 2* ACTIVE_BADGE_RADIUS,
GTK_JUNCTION_NONE);
if (_gtk_theming_background_has_background_image (&background))
{