callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix various compilation problems (#134312, David Hawthorne)

Browse Source 
Fri Feb 13 08:17:43 2004  Owen Taylor  <otaylor@redhat.com>

        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.
This commit is contained in:
Owen Taylor
2004-02-13 13:21:10 +00:00
committed by Owen Taylor
parent 7054daac80
commit 634850fdf9
8 changed files with 95 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ChangeLog
View File

@ -1,3 +1,21 @@
Fri Feb 13 08:17:43 2004 Owen Taylor <otaylor@redhat.com>
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 <otaylor@redhat.com>
Various reentrancy fixes for widgets being destroyed

18
ChangeLog.pre-2-10
View File

@ -1,3 +1,21 @@
Fri Feb 13 08:17:43 2004 Owen Taylor <otaylor@redhat.com>
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 <otaylor@redhat.com>
Various reentrancy fixes for widgets being destroyed

18
ChangeLog.pre-2-4
View File

@ -1,3 +1,21 @@
Fri Feb 13 08:17:43 2004 Owen Taylor <otaylor@redhat.com>
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 <otaylor@redhat.com>
Various reentrancy fixes for widgets being destroyed

18
ChangeLog.pre-2-6
View File

@ -1,3 +1,21 @@
Fri Feb 13 08:17:43 2004 Owen Taylor <otaylor@redhat.com>
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 <otaylor@redhat.com>
Various reentrancy fixes for widgets being destroyed

18
ChangeLog.pre-2-8
View File

@ -1,3 +1,21 @@
Fri Feb 13 08:17:43 2004 Owen Taylor <otaylor@redhat.com>
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 <otaylor@redhat.com>
Various reentrancy fixes for widgets being destroyed

3
gtk/gtkhscale.c
View File

@ -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;

2
gtk/gtkscale.c
View File

@ -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);

7
gtk/gtkvscale.c
View File

@ -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;