diff options
| author | Owen Taylor <otaylor@gtk.org> | 1998-05-13 00:24:57 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 1998-05-13 00:24:57 +0000 |
| commit | 43dfe74c56563d40451fe17c7e4c1bee78987829 (patch) | |
| tree | 5a0e0dd02fa430b6b614b7bb3a358292f9ca8efc /gtk/gtkgamma.c | |
| parent | eae7b32f85826a42b2c22f57744d88c2f7c5abfd (diff) | |
| download | gtk+-43dfe74c56563d40451fe17c7e4c1bee78987829.tar.gz | |
Fixed up a stat() that Sopwith missed when changing stat => lstat.
Tue May 12 19:37:55 1998 Owen Taylor <otaylor@gtk.org>
* gtk/gtkrc.c (gtk_rc_parse_file): Fixed up a stat()
that Sopwith missed when changing stat => lstat.
Tue May 12 19:19:29 1998 Owen Taylor <otaylor@gtk.org>
* gtk/gtkinputdialog.c gtk/gtkgamma.c gtk/gtkrc.c
gtk/gtkcolorsel.c gtk/gtkclist.c gtk/testgtk.c: Use
GPOINTER_TO_INT/GINT_TO_POINTER macros where appropriate.
* gdk/gdk.c: Print sizeof() results
as g_print("%ld", (glong)sizeof(foo)), to deal with
sizeof() being long on Alpha's.
* gtk/testgtk.c: include <string.h> for strlen
Tue May 12 19:22:58 1998 Owen Taylor <otaylor@gtk.org>
* glib/glib.h: Added macros G[U]INT_TO_POINTER() and
GPOINTER_TO_[U]INT for storing small integers integers
inside pointers.
* glib/testglib.c: Print sizeof() results
as g_print("%ld", (glong)sizeof(foo)), to deal with
size_t being long on Alpha's.
Diffstat (limited to 'gtk/gtkgamma.c')
| -rw-r--r-- | gtk/gtkgamma.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk/gtkgamma.c b/gtk/gtkgamma.c index 955bae0f9c..19d34ef1ad 100644 --- a/gtk/gtkgamma.c +++ b/gtk/gtkgamma.c @@ -262,7 +262,7 @@ gtk_gamma_curve_init (GtkGammaCurve *curve) { curve->button[i] = gtk_toggle_button_new (); gtk_object_set_data (GTK_OBJECT (curve->button[i]), "_GtkGammaCurveIndex", - (gpointer) (long) i); + GINT_TO_POINTER (i)); gtk_container_add (GTK_CONTAINER (vbox), curve->button[i]); gtk_signal_connect (GTK_OBJECT (curve->button[i]), "realize", (GtkSignalFunc) button_realize_callback, 0); @@ -276,7 +276,7 @@ gtk_gamma_curve_init (GtkGammaCurve *curve) { curve->button[i] = gtk_button_new (); gtk_object_set_data (GTK_OBJECT (curve->button[i]), "_GtkGammaCurveIndex", - (gpointer) (long) i); + GINT_TO_POINTER (i)); gtk_container_add (GTK_CONTAINER (vbox), curve->button[i]); gtk_signal_connect (GTK_OBJECT (curve->button[i]), "realize", (GtkSignalFunc) button_realize_callback, 0); @@ -298,7 +298,7 @@ button_realize_callback (GtkWidget *w) GdkPixmap *pm; int i; - i = (long) gtk_object_get_data (GTK_OBJECT (w), "_GtkGammaCurveIndex"); + i = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (w), "_GtkGammaCurveIndex")); pm = gdk_pixmap_create_from_xpm_d (w->window, &mask, &w->style->bg[GTK_STATE_NORMAL], xpm[i]); @@ -320,7 +320,7 @@ button_toggled_callback (GtkWidget *w, gpointer data) if (!GTK_TOGGLE_BUTTON (w)->active) return; - active = (long) gtk_object_get_data (GTK_OBJECT (w), "_GtkGammaCurveIndex"); + active = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (w), "_GtkGammaCurveIndex")); for (i = 0; i < 3; ++i) if ((i != active) && GTK_TOGGLE_BUTTON (c->button[i])->active) @@ -371,7 +371,7 @@ button_clicked_callback (GtkWidget *w, gpointer data) GtkGammaCurve *c = data; int active; - active = (long) gtk_object_get_data (GTK_OBJECT (w), "_GtkGammaCurveIndex"); + active = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (w), "_GtkGammaCurveIndex")); if (active == 3) { /* set gamma */ |