AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Various minor cleanups related to -W

Browse Source 
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
This commit is contained in:
Owen Taylor 1998-03-11 22:49:40 +00:00 committed by Owen Taylor
parent 59436967d5
commit 48a15b7349
13 changed files with 56 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 1998-03-11 Elliot Lee <sopwith@bogus.circ.us.eu.org>
* gtk/gtkentry.h: Keep it consistent - * gtk/gtkentry.h: Keep it consistent -

5
ChangeLog.pre-2-0
View File

@ -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> 1998-03-11 Elliot Lee <sopwith@bogus.circ.us.eu.org>
* gtk/gtkentry.h: Keep it consistent - * gtk/gtkentry.h: Keep it consistent -

5
ChangeLog.pre-2-10
View File

@ -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> 1998-03-11 Elliot Lee <sopwith@bogus.circ.us.eu.org>
* gtk/gtkentry.h: Keep it consistent - * gtk/gtkentry.h: Keep it consistent -

5
ChangeLog.pre-2-2
View File

@ -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> 1998-03-11 Elliot Lee <sopwith@bogus.circ.us.eu.org>
* gtk/gtkentry.h: Keep it consistent - * gtk/gtkentry.h: Keep it consistent -

5
ChangeLog.pre-2-4
View File

@ -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> 1998-03-11 Elliot Lee <sopwith@bogus.circ.us.eu.org>
* gtk/gtkentry.h: Keep it consistent - * gtk/gtkentry.h: Keep it consistent -

5
ChangeLog.pre-2-6
View File

@ -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> 1998-03-11 Elliot Lee <sopwith@bogus.circ.us.eu.org>
* gtk/gtkentry.h: Keep it consistent - * gtk/gtkentry.h: Keep it consistent -

5
ChangeLog.pre-2-8
View File

@ -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> 1998-03-11 Elliot Lee <sopwith@bogus.circ.us.eu.org>
* gtk/gtkentry.h: Keep it consistent - * gtk/gtkentry.h: Keep it consistent -

4
gdk/gdkdnd.c
View File

@ -54,11 +54,11 @@ gdk_dnd_set_drag_shape(GdkWindow *default_pixmapwin,
gdk_window_ref(default_pixmapwin); gdk_window_ref(default_pixmapwin);
gdk_dnd.c->drag_pm_default = default_pixmapwin; gdk_dnd.c->drag_pm_default = default_pixmapwin;
gdk_dnd.c->default_hotspot = *default_hotspot; 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) if(goahead_pixmapwin)
{ {
gdk_window_ref(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->drag_pm_ok = goahead_pixmapwin;
gdk_dnd.c->ok_hotspot = *goahead_hotspot; gdk_dnd.c->ok_hotspot = *goahead_hotspot;
} }

4
gdk/x11/gdkdnd-x11.c
View File

@ -54,11 +54,11 @@ gdk_dnd_set_drag_shape(GdkWindow *default_pixmapwin,
gdk_window_ref(default_pixmapwin); gdk_window_ref(default_pixmapwin);
gdk_dnd.c->drag_pm_default = default_pixmapwin; gdk_dnd.c->drag_pm_default = default_pixmapwin;
gdk_dnd.c->default_hotspot = *default_hotspot; 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) if(goahead_pixmapwin)
{ {
gdk_window_ref(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->drag_pm_ok = goahead_pixmapwin;
gdk_dnd.c->ok_hotspot = *goahead_hotspot; gdk_dnd.c->ok_hotspot = *goahead_hotspot;
} }

12
gtk/gtkclist.c
View File

@ -3084,11 +3084,15 @@ get_selection_info (GtkCList * clist,
} }
gint 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 (clist != NULL, 0);
g_return_val_if_fail (GTK_IS_CLIST (clist), 0); g_return_val_if_fail (GTK_IS_CLIST (clist), 0);
return get_selection_info (clist, x, y, row, column); return get_selection_info (clist, x, y, row, column);
} }
/* /*

2
gtk/gtksignal.c
View File

@ -1185,7 +1185,7 @@ gtk_signal_connect_by_type (GtkObject *object,
while (class) while (class)
{ {
GtkType parent; GtkType parent;
gint *object_signals; guint *object_signals;
guint nsignals; guint nsignals;
guint i; guint i;

6
gtk/testgtk.c
View File

@ -1302,8 +1302,7 @@ cb_create_tree(GtkWidget* w)
if(GTK_TOGGLE_BUTTON(sTreeSampleSelection.browse_button)->active) if(GTK_TOGGLE_BUTTON(sTreeSampleSelection.browse_button)->active)
selection_mode = GTK_SELECTION_BROWSE; selection_mode = GTK_SELECTION_BROWSE;
else else
if(GTK_TOGGLE_BUTTON(sTreeSampleSelection.multiple_button)->active) selection_mode = GTK_SELECTION_MULTIPLE;
selection_mode = GTK_SELECTION_MULTIPLE;
/* get options choice */ /* get options choice */
draw_line = GTK_TOGGLE_BUTTON(sTreeSampleSelection.draw_line_button)->active; draw_line = GTK_TOGGLE_BUTTON(sTreeSampleSelection.draw_line_button)->active;
@ -2375,6 +2374,9 @@ create_spins ()
(gpointer) spinner2); (gpointer) spinner2);
gtk_box_pack_start (GTK_BOX (vbox2), spinner2, FALSE, TRUE, 0); 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"); button = gtk_check_button_new_with_label ("Snap to 0.5-ticks");
gtk_signal_connect (GTK_OBJECT (button), "clicked", gtk_signal_connect (GTK_OBJECT (button), "clicked",
GTK_SIGNAL_FUNC (toggle_snap), GTK_SIGNAL_FUNC (toggle_snap),

6
tests/testgtk.c
View File

@ -1302,8 +1302,7 @@ cb_create_tree(GtkWidget* w)
if(GTK_TOGGLE_BUTTON(sTreeSampleSelection.browse_button)->active) if(GTK_TOGGLE_BUTTON(sTreeSampleSelection.browse_button)->active)
selection_mode = GTK_SELECTION_BROWSE; selection_mode = GTK_SELECTION_BROWSE;
else else
if(GTK_TOGGLE_BUTTON(sTreeSampleSelection.multiple_button)->active) selection_mode = GTK_SELECTION_MULTIPLE;
selection_mode = GTK_SELECTION_MULTIPLE;
/* get options choice */ /* get options choice */
draw_line = GTK_TOGGLE_BUTTON(sTreeSampleSelection.draw_line_button)->active; draw_line = GTK_TOGGLE_BUTTON(sTreeSampleSelection.draw_line_button)->active;
@ -2375,6 +2374,9 @@ create_spins ()
(gpointer) spinner2); (gpointer) spinner2);
gtk_box_pack_start (GTK_BOX (vbox2), spinner2, FALSE, TRUE, 0); 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"); button = gtk_check_button_new_with_label ("Snap to 0.5-ticks");
gtk_signal_connect (GTK_OBJECT (button), "clicked", gtk_signal_connect (GTK_OBJECT (button), "clicked",
GTK_SIGNAL_FUNC (toggle_snap), GTK_SIGNAL_FUNC (toggle_snap),