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

GtkAccelLabel: unconditionally chain up in draw

Browse Source 
No need to check, we know for sure that GtkLabel has a draw
function.
This commit is contained in:
Matthias Clasen 2014-07-19 23:37:43 -04:00
parent 2ddbca7ba5
commit 73267102fd
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtkaccellabel.c
View File

@ -418,9 +418,7 @@ gtk_accel_label_draw (GtkWidget *widget,
allocation.width -= ac_width; allocation.width -= ac_width;
gtk_widget_set_allocation (widget, &allocation); gtk_widget_set_allocation (widget, &allocation);
if (GTK_WIDGET_CLASS (gtk_accel_label_parent_class)->draw) GTK_WIDGET_CLASS (gtk_accel_label_parent_class)->draw (widget, cr);
GTK_WIDGET_CLASS (gtk_accel_label_parent_class)->draw (widget,
cr);
allocation.width += ac_width; allocation.width += ac_width;
gtk_widget_set_allocation (widget, &allocation); gtk_widget_set_allocation (widget, &allocation);
if (gtk_label_get_ellipsize (label)) if (gtk_label_get_ellipsize (label))
@ -443,7 +441,6 @@ gtk_accel_label_draw (GtkWidget *widget,
gtk_style_context_save (context); gtk_style_context_save (context);
gtk_style_context_add_class (context, GTK_STYLE_CLASS_ACCELERATOR); gtk_style_context_add_class (context, GTK_STYLE_CLASS_ACCELERATOR);
gtk_render_layout (context, cr, x, y, accel_layout); gtk_render_layout (context, cr, x, y, accel_layout);
gtk_style_context_restore (context); gtk_style_context_restore (context);
@ -451,8 +448,7 @@ gtk_accel_label_draw (GtkWidget *widget,
} }
else else
{ {
if (GTK_WIDGET_CLASS (gtk_accel_label_parent_class)->draw) GTK_WIDGET_CLASS (gtk_accel_label_parent_class)->draw (widget, cr);
GTK_WIDGET_CLASS (gtk_accel_label_parent_class)->draw (widget, cr);
} }
return FALSE; return FALSE;