diff options
Diffstat (limited to 'gtk/gtkpixmap.c')
| -rw-r--r-- | gtk/gtkpixmap.c | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/gtk/gtkpixmap.c b/gtk/gtkpixmap.c index 5f4006555e..9cc6ec0076 100644 --- a/gtk/gtkpixmap.c +++ b/gtk/gtkpixmap.c @@ -80,15 +80,15 @@ GtkWidget* gtk_pixmap_new (GdkPixmap *val, GdkBitmap *mask) { - GtkPixmap *pixmap; - - g_return_val_if_fail (val != NULL, NULL); - - pixmap = gtk_type_new (gtk_pixmap_get_type ()); + GtkPixmap *pixmap; - gtk_pixmap_set (pixmap, val, mask); - - return GTK_WIDGET (pixmap); + g_return_val_if_fail (val != NULL, NULL); + + pixmap = gtk_type_new (gtk_pixmap_get_type ()); + + gtk_pixmap_set (pixmap, val, mask); + + return GTK_WIDGET (pixmap); } static void @@ -184,17 +184,6 @@ gtk_pixmap_expose (GtkWidget *widget, pixmap = GTK_PIXMAP (widget); misc = GTK_MISC (widget); -/* - x = widget->allocation.x + - (gint)((gfloat)((widget->allocation.width - - widget->requisition.width) - + (misc->xpad * 2)) * misc->xalign); - y = widget->allocation.y + - (gint)((gfloat)((widget->allocation.height - - widget->requisition.height) - + (misc->ypad * 2)) * misc->yalign); -*/ - x = (widget->allocation.x * (1.0 - misc->xalign) + (widget->allocation.x + widget->allocation.width - (widget->requisition.width - misc->xpad * 2)) * |