diff options
| author | Manish Singh <yosh@src.gnome.org> | 1998-12-11 05:52:42 +0000 |
|---|---|---|
| committer | Manish Singh <yosh@src.gnome.org> | 1998-12-11 05:52:42 +0000 |
| commit | 6af277b502e8fd0a3668fa0f7821a929d0e059f5 (patch) | |
| tree | 6d2b617cfc7bfafab281ce674954628d4d39d3a1 /gtk | |
| parent | 939c818395954177ecd9c79fa89f86bed9349bef (diff) | |
| download | gtk+-6af277b502e8fd0a3668fa0f7821a929d0e059f5.tar.gz | |
avoid void pointer math
* gtk/gtkclist.c: avoid void pointer math
* gtk/gtkhscale.c
* gtk/gtkhscrollbar.c
* gtk/gtkvscale.c
* gtk/gtkvscrollbar.c: removed trailing , from enums
* gtk/gtksignal.c: can't use enums as a bitfield type, use guint
* gtk/testgtk.c: removed C++ comment added by owenpoo
-Yosh
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkclist.c | 2 | ||||
| -rw-r--r-- | gtk/gtkhscale.c | 2 | ||||
| -rw-r--r-- | gtk/gtkhscrollbar.c | 2 | ||||
| -rw-r--r-- | gtk/gtksignal.c | 2 | ||||
| -rw-r--r-- | gtk/gtkvscale.c | 2 | ||||
| -rw-r--r-- | gtk/gtkvscrollbar.c | 2 | ||||
| -rw-r--r-- | gtk/testgtk.c | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c index 8bcc6b03b1..fc5fdc2413 100644 --- a/gtk/gtkclist.c +++ b/gtk/gtkclist.c @@ -2891,7 +2891,7 @@ real_row_move (GtkCList *clist, list->data = GINT_TO_POINTER (dest_row); else if (first <= GPOINTER_TO_INT (list->data) && last >= GPOINTER_TO_INT (list->data)) - list->data += d; + list->data = GINT_TO_POINTER (GPOINTER_TO_INT (list->data) + d); } if (clist->focus_row == source_row) diff --git a/gtk/gtkhscale.c b/gtk/gtkhscale.c index 42b7721c1a..62513627f4 100644 --- a/gtk/gtkhscale.c +++ b/gtk/gtkhscale.c @@ -27,7 +27,7 @@ enum { ARG_0, - ARG_ADJUSTMENT, + ARG_ADJUSTMENT }; static void gtk_hscale_class_init (GtkHScaleClass *klass); diff --git a/gtk/gtkhscrollbar.c b/gtk/gtkhscrollbar.c index cf7c6650b8..077e39a555 100644 --- a/gtk/gtkhscrollbar.c +++ b/gtk/gtkhscrollbar.c @@ -27,7 +27,7 @@ enum { ARG_0, - ARG_ADJUSTMENT, + ARG_ADJUSTMENT }; static void gtk_hscrollbar_class_init (GtkHScrollbarClass *klass); diff --git a/gtk/gtksignal.c b/gtk/gtksignal.c index 6fe59937b8..26052d2167 100644 --- a/gtk/gtksignal.c +++ b/gtk/gtksignal.c @@ -57,7 +57,7 @@ struct _GtkSignal guint function_offset; GtkSignalMarshaller marshaller; GtkType return_val; - GtkSignalRunType signal_flags : 16; + guint signal_flags : 16; guint nparams : 16; GtkType *params; GHookList *hook_list; diff --git a/gtk/gtkvscale.c b/gtk/gtkvscale.c index 25a453c1b8..cacf96426b 100644 --- a/gtk/gtkvscale.c +++ b/gtk/gtkvscale.c @@ -27,7 +27,7 @@ enum { ARG_0, - ARG_ADJUSTMENT, + ARG_ADJUSTMENT }; static void gtk_vscale_class_init (GtkVScaleClass *klass); diff --git a/gtk/gtkvscrollbar.c b/gtk/gtkvscrollbar.c index d4485283ec..dba415a5fb 100644 --- a/gtk/gtkvscrollbar.c +++ b/gtk/gtkvscrollbar.c @@ -27,7 +27,7 @@ enum { ARG_0, - ARG_ADJUSTMENT, + ARG_ADJUSTMENT }; static void gtk_vscrollbar_class_init (GtkVScrollbarClass *klass); diff --git a/gtk/testgtk.c b/gtk/testgtk.c index 4a24d8e033..9b906bd444 100644 --- a/gtk/testgtk.c +++ b/gtk/testgtk.c @@ -8169,7 +8169,7 @@ void create_layout (void) { sprintf(buf, "Button %d, %d", i, j); if ((i + j) % 2) - // button = gtk_button_new_with_label (buf); + /* button = gtk_button_new_with_label (buf); */ button = gtk_combo_new(); else button = gtk_label_new (buf); |