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

Preserve gtk_widget_get_default_style semantics

Browse Source 
Make sure that we return a GtkStyle even if there's no screen yet.
This commit is contained in:
Matthias Clasen
2012-09-17 07:51:04 -04:00
parent 74f011d24e
commit 70384941fb
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/deprecated/gtkstyle.c
View File

@ -4045,15 +4045,23 @@ gtk_widget_get_default_style_for_screen (GdkScreen *screen)
* gtk_css_provider_get_default() to obtain a #GtkStyleProvider
* with the default widget style information.
*/
GtkStyle*
GtkStyle *
gtk_widget_get_default_style (void)
{
static GtkStyle *default_style = NULL;
GtkStyle *style = NULL;
GdkScreen *screen = gdk_screen_get_default ();
if (screen)
return gtk_widget_get_default_style_for_screen (screen);
style = gtk_widget_get_default_style_for_screen (screen);
else
return NULL;
{
if (default_style == NULL)
default_style = gtk_style_new ();
style = default_style;
}
return style;
}
/**