diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2014-07-19 23:37:43 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2014-07-19 23:37:43 -0400 |
| commit | 73267102fd4ec44541bd4b4fe21f624757e1ca0c (patch) | |
| tree | cf3d0aa26eafd38bc1aae84b40e5c26bfc93f76a | |
| parent | 2ddbca7ba503860911092f46633035da2345938d (diff) | |
| download | gtk+-73267102fd4ec44541bd4b4fe21f624757e1ca0c.tar.gz | |
GtkAccelLabel: unconditionally chain up in draw
No need to check, we know for sure that GtkLabel has a draw
function.
| -rw-r--r-- | gtk/gtkaccellabel.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c index 81eab12ebf..ba7c9ab6d0 100644 --- a/gtk/gtkaccellabel.c +++ b/gtk/gtkaccellabel.c @@ -418,9 +418,7 @@ gtk_accel_label_draw (GtkWidget *widget, allocation.width -= ac_width; 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; gtk_widget_set_allocation (widget, &allocation); if (gtk_label_get_ellipsize (label)) @@ -443,7 +441,6 @@ gtk_accel_label_draw (GtkWidget *widget, gtk_style_context_save (context); gtk_style_context_add_class (context, GTK_STYLE_CLASS_ACCELERATOR); - gtk_render_layout (context, cr, x, y, accel_layout); gtk_style_context_restore (context); @@ -451,8 +448,7 @@ gtk_accel_label_draw (GtkWidget *widget, } 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; |