AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-06 00:30:08 +00:00
Code Issues Projects Releases Wiki Activity

accellabel: Remove gtk_widget_is_drawable() check from draw vfunc

Browse Source
This commit is contained in:
Benjamin Otte 2010-09-26 00:55:48 +02:00
parent 41e6da4075
commit c34c05217c
1 changed files with 62 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk/gtkaccellabel.c
View File

@ -383,15 +383,11 @@ gtk_accel_label_draw (GtkWidget *widget,
GtkAccelLabel *accel_label = GTK_ACCEL_LABEL (widget); GtkAccelLabel *accel_label = GTK_ACCEL_LABEL (widget);
GtkMisc *misc = GTK_MISC (accel_label); GtkMisc *misc = GTK_MISC (accel_label);
GtkTextDirection direction; GtkTextDirection direction;
direction = gtk_widget_get_direction (widget);
if (gtk_widget_is_drawable (widget))
{
guint ac_width; guint ac_width;
GtkAllocation allocation; GtkAllocation allocation;
GtkRequisition requisition; GtkRequisition requisition;
direction = gtk_widget_get_direction (widget);
ac_width = gtk_accel_label_get_accel_width (accel_label); ac_width = gtk_accel_label_get_accel_width (accel_label);
gtk_widget_get_allocation (widget, &allocation); gtk_widget_get_allocation (widget, &allocation);
gtk_widget_get_preferred_size (widget, &requisition, NULL); gtk_widget_get_preferred_size (widget, &requisition, NULL);
@ -462,7 +458,6 @@ gtk_accel_label_draw (GtkWidget *widget,
if (GTK_WIDGET_CLASS (gtk_accel_label_parent_class)->draw) 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;
} }