From 634850fdf9978beda07f5e341876ba541c50158b Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 13 Feb 2004 13:21:10 +0000 Subject: Fix various compilation problems (#134312, David Hawthorne) Fri Feb 13 08:17:43 2004 Owen Taylor Fix various compilation problems (#134312, David Hawthorne) * gtk/gtkscale.c (gtk_scale_get_layout_offsets): Use g_return_if_fail(), not g_return_val_if_fail(). * gtk/gtkvscale.c (gtk_vscale_get_layout_offsets): * gtk/gtkhscale.c (gtk_hscale_get_layout_offsets): Use g_return_if_reached(), not g_return_val_if_reached(). * gtk/gtkvscale.c (gtk_vscale_expose): Fix the types of some parameters. * gtk/gtkhscale.c (gtk_hscale_get_layout_offsets): Remove extra 'scale' parameter. --- gtk/gtkvscale.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gtk/gtkvscale.c') diff --git a/gtk/gtkvscale.c b/gtk/gtkvscale.c index 86a4d93d41..c7b8b9e5c1 100644 --- a/gtk/gtkvscale.c +++ b/gtk/gtkvscale.c @@ -171,8 +171,8 @@ gtk_vscale_expose (GtkWidget *widget, gint x, y; GtkStateType state_type; - layout = gtk_scale_get_layout (widget); - gtk_scale_get_layout_offsets (widget, &x, &y); + layout = gtk_scale_get_layout (scale); + gtk_scale_get_layout_offsets (scale, &x, &y); state_type = GTK_STATE_NORMAL; if (!GTK_WIDGET_IS_SENSITIVE (scale)) @@ -200,7 +200,6 @@ gtk_vscale_get_layout_offsets (GtkScale *scale, { GtkWidget *widget; GtkRange *range; - GtkScale *scale; PangoLayout *layout; PangoRectangle logical_rect; gint value_spacing; @@ -248,7 +247,7 @@ gtk_vscale_get_layout_offsets (GtkScale *scale, break; default: - g_return_val_if_reached (FALSE); + g_return_if_reached (); *x = 0; *y = 0; break; -- cgit v1.2.1