From 634850fdf9978beda07f5e341876ba541c50158b Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 13 Feb 2004 13:21:10 +0000 Subject: [PATCH] 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. --- ChangeLog | 18 ++++++++++++++++++ ChangeLog.pre-2-10 | 18 ++++++++++++++++++ ChangeLog.pre-2-4 | 18 ++++++++++++++++++ ChangeLog.pre-2-6 | 18 ++++++++++++++++++ ChangeLog.pre-2-8 | 18 ++++++++++++++++++ gtk/gtkhscale.c | 3 +-- gtk/gtkscale.c | 2 +- gtk/gtkvscale.c | 7 +++---- 8 files changed, 95 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index f6c17e4a98..a7b7ce52ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +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. + Thu Feb 12 21:58:20 2004 Owen Taylor Various reentrancy fixes for widgets being destroyed diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f6c17e4a98..a7b7ce52ca 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,21 @@ +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. + Thu Feb 12 21:58:20 2004 Owen Taylor Various reentrancy fixes for widgets being destroyed diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index f6c17e4a98..a7b7ce52ca 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,21 @@ +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. + Thu Feb 12 21:58:20 2004 Owen Taylor Various reentrancy fixes for widgets being destroyed diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f6c17e4a98..a7b7ce52ca 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,21 @@ +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. + Thu Feb 12 21:58:20 2004 Owen Taylor Various reentrancy fixes for widgets being destroyed diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f6c17e4a98..a7b7ce52ca 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,21 @@ +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. + Thu Feb 12 21:58:20 2004 Owen Taylor Various reentrancy fixes for widgets being destroyed diff --git a/gtk/gtkhscale.c b/gtk/gtkhscale.c index 4ca302e4e6..8df0401ffb 100644 --- a/gtk/gtkhscale.c +++ b/gtk/gtkhscale.c @@ -198,7 +198,6 @@ gtk_hscale_get_layout_offsets (GtkScale *scale, { GtkWidget *widget; GtkRange *range; - GtkScale *scale; PangoLayout *layout; PangoRectangle logical_rect; gint value_spacing; @@ -248,7 +247,7 @@ gtk_hscale_get_layout_offsets (GtkScale *scale, break; default: - g_return_val_if_reached (FALSE); + g_return_if_reached (); *x = 0; *y = 0; break; diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c index 003d56461d..3fdab558eb 100644 --- a/gtk/gtkscale.c +++ b/gtk/gtkscale.c @@ -721,7 +721,7 @@ gtk_scale_get_layout_offsets (GtkScale *scale, { gint local_x, local_y; - g_return_val_if_fail (GTK_IS_SCALE (scale), NULL); + g_return_if_fail (GTK_IS_SCALE (scale)); if (GTK_SCALE_GET_CLASS (scale)->get_layout_offsets) (GTK_SCALE_GET_CLASS (scale)->get_layout_offsets) (scale, &local_x, &local_y); 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;