diff options
author | Owen Taylor <owt1@cornell.edu> | 1998-03-11 22:49:40 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 1998-03-11 22:49:40 +0000 |
commit | 48a15b7349af2e5ac62005f5bddd915fce6d6853 (patch) | |
tree | e343b470986dcd71ad8d62d6b59d10c87de4e50c | |
parent | 59436967d5d15cf5639333a3fddd2183cbf60693 (diff) | |
download | gdk-pixbuf-48a15b7349af2e5ac62005f5bddd915fce6d6853.tar.gz |
Various minor cleanups related to -W
Tue Mar 10 23:02:42 1998 Owen Taylor <owt1@cornell.edu>
* gdk/gdkdnd.c gtk/gtkclist.c gtk/gtksignal.c gtk/testgtk.c:
Various minor cleanups related to -W
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ChangeLog.pre-2-0 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-2-2 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-2-4 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-2-6 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-2-8 | 5 | ||||
-rw-r--r-- | gdk/gdkdnd.c | 4 | ||||
-rw-r--r-- | gdk/x11/gdkdnd-x11.c | 4 | ||||
-rw-r--r-- | gtk/gtkclist.c | 12 | ||||
-rw-r--r-- | gtk/gtksignal.c | 2 | ||||
-rw-r--r-- | gtk/testgtk.c | 6 | ||||
-rw-r--r-- | tests/testgtk.c | 6 |
13 files changed, 56 insertions, 13 deletions
@@ -1,3 +1,8 @@ +Tue Mar 10 23:02:42 1998 Owen Taylor <owt1@cornell.edu> + + * gdk/gdkdnd.c gtk/gtkclist.c gtk/gtksignal.c gtk/testgtk.c: + Various minor cleanups related to -W + 1998-03-11 Elliot Lee <sopwith@bogus.circ.us.eu.org> * gtk/gtkentry.h: Keep it consistent - diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 4a75affc3..70d459484 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Tue Mar 10 23:02:42 1998 Owen Taylor <owt1@cornell.edu> + + * gdk/gdkdnd.c gtk/gtkclist.c gtk/gtksignal.c gtk/testgtk.c: + Various minor cleanups related to -W + 1998-03-11 Elliot Lee <sopwith@bogus.circ.us.eu.org> * gtk/gtkentry.h: Keep it consistent - diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4a75affc3..70d459484 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Tue Mar 10 23:02:42 1998 Owen Taylor <owt1@cornell.edu> + + * gdk/gdkdnd.c gtk/gtkclist.c gtk/gtksignal.c gtk/testgtk.c: + Various minor cleanups related to -W + 1998-03-11 Elliot Lee <sopwith@bogus.circ.us.eu.org> * gtk/gtkentry.h: Keep it consistent - diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 4a75affc3..70d459484 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Tue Mar 10 23:02:42 1998 Owen Taylor <owt1@cornell.edu> + + * gdk/gdkdnd.c gtk/gtkclist.c gtk/gtksignal.c gtk/testgtk.c: + Various minor cleanups related to -W + 1998-03-11 Elliot Lee <sopwith@bogus.circ.us.eu.org> * gtk/gtkentry.h: Keep it consistent - diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 4a75affc3..70d459484 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Tue Mar 10 23:02:42 1998 Owen Taylor <owt1@cornell.edu> + + * gdk/gdkdnd.c gtk/gtkclist.c gtk/gtksignal.c gtk/testgtk.c: + Various minor cleanups related to -W + 1998-03-11 Elliot Lee <sopwith@bogus.circ.us.eu.org> * gtk/gtkentry.h: Keep it consistent - diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 4a75affc3..70d459484 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Tue Mar 10 23:02:42 1998 Owen Taylor <owt1@cornell.edu> + + * gdk/gdkdnd.c gtk/gtkclist.c gtk/gtksignal.c gtk/testgtk.c: + Various minor cleanups related to -W + 1998-03-11 Elliot Lee <sopwith@bogus.circ.us.eu.org> * gtk/gtkentry.h: Keep it consistent - diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 4a75affc3..70d459484 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Tue Mar 10 23:02:42 1998 Owen Taylor <owt1@cornell.edu> + + * gdk/gdkdnd.c gtk/gtkclist.c gtk/gtksignal.c gtk/testgtk.c: + Various minor cleanups related to -W + 1998-03-11 Elliot Lee <sopwith@bogus.circ.us.eu.org> * gtk/gtkentry.h: Keep it consistent - diff --git a/gdk/gdkdnd.c b/gdk/gdkdnd.c index 0b1c256b8..be84e6dbf 100644 --- a/gdk/gdkdnd.c +++ b/gdk/gdkdnd.c @@ -54,11 +54,11 @@ gdk_dnd_set_drag_shape(GdkWindow *default_pixmapwin, gdk_window_ref(default_pixmapwin); gdk_dnd.c->drag_pm_default = default_pixmapwin; gdk_dnd.c->default_hotspot = *default_hotspot; - gdk_dnd.c->xids = g_list_append(gdk_dnd.c->xids, ((GdkWindowPrivate *)default_pixmapwin)->xwindow); + gdk_dnd.c->xids = g_list_append(gdk_dnd.c->xids, (gpointer)(glong)((GdkWindowPrivate *)default_pixmapwin)->xwindow); if(goahead_pixmapwin) { gdk_window_ref(goahead_pixmapwin); - gdk_dnd.c->xids = g_list_append(gdk_dnd.c->xids, ((GdkWindowPrivate *)goahead_pixmapwin)->xwindow); + gdk_dnd.c->xids = g_list_append(gdk_dnd.c->xids, (gpointer)(glong)((GdkWindowPrivate *)goahead_pixmapwin)->xwindow); gdk_dnd.c->drag_pm_ok = goahead_pixmapwin; gdk_dnd.c->ok_hotspot = *goahead_hotspot; } diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c index 0b1c256b8..be84e6dbf 100644 --- a/gdk/x11/gdkdnd-x11.c +++ b/gdk/x11/gdkdnd-x11.c @@ -54,11 +54,11 @@ gdk_dnd_set_drag_shape(GdkWindow *default_pixmapwin, gdk_window_ref(default_pixmapwin); gdk_dnd.c->drag_pm_default = default_pixmapwin; gdk_dnd.c->default_hotspot = *default_hotspot; - gdk_dnd.c->xids = g_list_append(gdk_dnd.c->xids, ((GdkWindowPrivate *)default_pixmapwin)->xwindow); + gdk_dnd.c->xids = g_list_append(gdk_dnd.c->xids, (gpointer)(glong)((GdkWindowPrivate *)default_pixmapwin)->xwindow); if(goahead_pixmapwin) { gdk_window_ref(goahead_pixmapwin); - gdk_dnd.c->xids = g_list_append(gdk_dnd.c->xids, ((GdkWindowPrivate *)goahead_pixmapwin)->xwindow); + gdk_dnd.c->xids = g_list_append(gdk_dnd.c->xids, (gpointer)(glong)((GdkWindowPrivate *)goahead_pixmapwin)->xwindow); gdk_dnd.c->drag_pm_ok = goahead_pixmapwin; gdk_dnd.c->ok_hotspot = *goahead_hotspot; } diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c index d3ad6621f..7fdb57178 100644 --- a/gtk/gtkclist.c +++ b/gtk/gtkclist.c @@ -3084,11 +3084,15 @@ get_selection_info (GtkCList * clist, } gint -gtk_clist_get_selection_info (GtkCList *clist, gint x, gint y, gint *row, gint *column) +gtk_clist_get_selection_info (GtkCList *clist, + gint x, + gint y, + gint * row, + gint * column) { - g_return_val_if_fail (clist != NULL, 0); - g_return_val_if_fail (GTK_IS_CLIST (clist), 0); - return get_selection_info (clist, x, y, row, column); + g_return_val_if_fail (clist != NULL, 0); + g_return_val_if_fail (GTK_IS_CLIST (clist), 0); + return get_selection_info (clist, x, y, row, column); } /* diff --git a/gtk/gtksignal.c b/gtk/gtksignal.c index b578917b5..be83a4ec0 100644 --- a/gtk/gtksignal.c +++ b/gtk/gtksignal.c @@ -1185,7 +1185,7 @@ gtk_signal_connect_by_type (GtkObject *object, while (class) { GtkType parent; - gint *object_signals; + guint *object_signals; guint nsignals; guint i; diff --git a/gtk/testgtk.c b/gtk/testgtk.c index 31afd7af3..486931aba 100644 --- a/gtk/testgtk.c +++ b/gtk/testgtk.c @@ -1302,8 +1302,7 @@ cb_create_tree(GtkWidget* w) if(GTK_TOGGLE_BUTTON(sTreeSampleSelection.browse_button)->active) selection_mode = GTK_SELECTION_BROWSE; else - if(GTK_TOGGLE_BUTTON(sTreeSampleSelection.multiple_button)->active) - selection_mode = GTK_SELECTION_MULTIPLE; + selection_mode = GTK_SELECTION_MULTIPLE; /* get options choice */ draw_line = GTK_TOGGLE_BUTTON(sTreeSampleSelection.draw_line_button)->active; @@ -2375,6 +2374,9 @@ create_spins () (gpointer) spinner2); gtk_box_pack_start (GTK_BOX (vbox2), spinner2, FALSE, TRUE, 0); + hbox = gtk_hbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 5); + button = gtk_check_button_new_with_label ("Snap to 0.5-ticks"); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (toggle_snap), diff --git a/tests/testgtk.c b/tests/testgtk.c index 31afd7af3..486931aba 100644 --- a/tests/testgtk.c +++ b/tests/testgtk.c @@ -1302,8 +1302,7 @@ cb_create_tree(GtkWidget* w) if(GTK_TOGGLE_BUTTON(sTreeSampleSelection.browse_button)->active) selection_mode = GTK_SELECTION_BROWSE; else - if(GTK_TOGGLE_BUTTON(sTreeSampleSelection.multiple_button)->active) - selection_mode = GTK_SELECTION_MULTIPLE; + selection_mode = GTK_SELECTION_MULTIPLE; /* get options choice */ draw_line = GTK_TOGGLE_BUTTON(sTreeSampleSelection.draw_line_button)->active; @@ -2375,6 +2374,9 @@ create_spins () (gpointer) spinner2); gtk_box_pack_start (GTK_BOX (vbox2), spinner2, FALSE, TRUE, 0); + hbox = gtk_hbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 5); + button = gtk_check_button_new_with_label ("Snap to 0.5-ticks"); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (toggle_snap), |