AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-25 21:21:21 +00:00
Code Issues Projects Releases Wiki Activity

merges from stable branch

Browse Source
This commit is contained in:
Stuart Parmenter 1999-03-17 03:42:22 +00:00
parent 2d49bbb044
commit 95931e18aa
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gtk/gtkstyle.c
View File

@ -365,7 +365,20 @@ gtk_style_copy (GtkStyle *style)
gdk_font_unref (new_style->font);
new_style->font = style->font;
gdk_font_ref (new_style->font);
if (style->rc_style)
{
new_style->rc_style = style->rc_style;
gtk_rc_style_ref (style->rc_style);
}
if (style->engine)
{
new_style->engine = style->engine;
gtk_theme_engine_ref(new_style->engine);
new_style->engine->duplicate_style (new_style, style);
}
return new_style;
}
@ -381,18 +394,6 @@ gtk_style_duplicate (GtkStyle *style)
style->styles = g_slist_append (style->styles, new_style);
new_style->styles = style->styles;
if (style->rc_style)
{
new_style->rc_style = style->rc_style;
gtk_rc_style_ref (style->rc_style);
}
if (style->engine)
{
new_style->engine = style->engine;
new_style->engine->duplicate_style (new_style, style);
}
return new_style;
}