AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-26 05:31:07 +00:00
Code Issues Projects Releases Wiki Activity

Renamed merge' -> my_merge' and mergesort' -> my_mergesort'.

Browse Source 
1998-08-06  Martin Baulig  <martin@home-of-linux.org>

	* gtk/gtkclist.c: Renamed `merge' -> `my_merge' and
	`mergesort' -> `my_mergesort'.
This commit is contained in:
Martin Baulig 1998-08-06 02:20:47 +00:00 committed by Martin Baulig
parent c8df83a2fe
commit 123709106e
8 changed files with 51 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
1998-08-06 Martin Baulig <martin@home-of-linux.org>
* gtk/gtkclist.c: Renamed `merge' -> `my_merge' and
`mergesort' -> `my_mergesort'.
Wed Aug 5 21:12:37 1998 Stefan Jeske <stefan@gtk.org> Wed Aug 5 21:12:37 1998 Stefan Jeske <stefan@gtk.org>
* gtk/gtkenums.h: new enum GtkSortType. * gtk/gtkenums.h: new enum GtkSortType.

5
ChangeLog.pre-2-0
View File

@ -1,3 +1,8 @@
1998-08-06 Martin Baulig <martin@home-of-linux.org>
* gtk/gtkclist.c: Renamed `merge' -> `my_merge' and
`mergesort' -> `my_mergesort'.
Wed Aug 5 21:12:37 1998 Stefan Jeske <stefan@gtk.org> Wed Aug 5 21:12:37 1998 Stefan Jeske <stefan@gtk.org>
* gtk/gtkenums.h: new enum GtkSortType. * gtk/gtkenums.h: new enum GtkSortType.

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
1998-08-06 Martin Baulig <martin@home-of-linux.org>
* gtk/gtkclist.c: Renamed `merge' -> `my_merge' and
`mergesort' -> `my_mergesort'.
Wed Aug 5 21:12:37 1998 Stefan Jeske <stefan@gtk.org> Wed Aug 5 21:12:37 1998 Stefan Jeske <stefan@gtk.org>
* gtk/gtkenums.h: new enum GtkSortType. * gtk/gtkenums.h: new enum GtkSortType.

5
ChangeLog.pre-2-2
View File

@ -1,3 +1,8 @@
1998-08-06 Martin Baulig <martin@home-of-linux.org>
* gtk/gtkclist.c: Renamed `merge' -> `my_merge' and
`mergesort' -> `my_mergesort'.
Wed Aug 5 21:12:37 1998 Stefan Jeske <stefan@gtk.org> Wed Aug 5 21:12:37 1998 Stefan Jeske <stefan@gtk.org>
* gtk/gtkenums.h: new enum GtkSortType. * gtk/gtkenums.h: new enum GtkSortType.

5
ChangeLog.pre-2-4
View File

@ -1,3 +1,8 @@
1998-08-06 Martin Baulig <martin@home-of-linux.org>
* gtk/gtkclist.c: Renamed `merge' -> `my_merge' and
`mergesort' -> `my_mergesort'.
Wed Aug 5 21:12:37 1998 Stefan Jeske <stefan@gtk.org> Wed Aug 5 21:12:37 1998 Stefan Jeske <stefan@gtk.org>
* gtk/gtkenums.h: new enum GtkSortType. * gtk/gtkenums.h: new enum GtkSortType.

5
ChangeLog.pre-2-6
View File

@ -1,3 +1,8 @@
1998-08-06 Martin Baulig <martin@home-of-linux.org>
* gtk/gtkclist.c: Renamed `merge' -> `my_merge' and
`mergesort' -> `my_mergesort'.
Wed Aug 5 21:12:37 1998 Stefan Jeske <stefan@gtk.org> Wed Aug 5 21:12:37 1998 Stefan Jeske <stefan@gtk.org>
* gtk/gtkenums.h: new enum GtkSortType. * gtk/gtkenums.h: new enum GtkSortType.

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
1998-08-06 Martin Baulig <martin@home-of-linux.org>
* gtk/gtkclist.c: Renamed `merge' -> `my_merge' and
`mergesort' -> `my_mergesort'.
Wed Aug 5 21:12:37 1998 Stefan Jeske <stefan@gtk.org> Wed Aug 5 21:12:37 1998 Stefan Jeske <stefan@gtk.org>
* gtk/gtkenums.h: new enum GtkSortType. * gtk/gtkenums.h: new enum GtkSortType.

32
gtk/gtkclist.c
View File

@ -354,12 +354,12 @@ static void extend_selection (GtkCList *clist,
static gint default_compare (GtkCList *clist, static gint default_compare (GtkCList *clist,
gconstpointer row1, gconstpointer row1,
gconstpointer row2); gconstpointer row2);
static GList * merge (GtkCList *clist, static GList * my_merge (GtkCList *clist,
GList *a, GList *a,
GList *b); GList *b);
static GList * mergesort (GtkCList *clist, static GList * my_mergesort (GtkCList *clist,
GList *list, GList *list,
gint num); gint num);
/* Fill in data after widget is realized and has style */ /* Fill in data after widget is realized and has style */
@ -6063,9 +6063,9 @@ gtk_clist_set_sort_column (GtkCList *clist,
} }
static GList * static GList *
merge (GtkCList *clist, my_merge (GtkCList *clist,
GList *a, /* first list to merge */ GList *a, /* first list to merge */
GList *b) /* second list to merge */ GList *b) /* second list to merge */
{ {
GList z = { 0 }; /* auxiliary node */ GList z = { 0 }; /* auxiliary node */
GList *c; GList *c;
@ -6117,9 +6117,9 @@ merge (GtkCList *clist,
} }
static GList * static GList *
mergesort (GtkCList *clist, my_mergesort (GtkCList *clist,
GList *list, /* the list to sort */ GList *list, /* the list to sort */
gint num) /* the list's length */ gint num) /* the list's length */
{ {
GList *half; GList *half;
gint i; gint i;
@ -6140,9 +6140,9 @@ mergesort (GtkCList *clist,
half->prev = NULL; half->prev = NULL;
/* recursively sort both lists */ /* recursively sort both lists */
return merge (clist, return my_merge (clist,
mergesort (clist, list, num / 2), my_mergesort (clist, list, num / 2),
mergesort (clist, half, num - num / 2)); my_mergesort (clist, half, num - num / 2));
} }
} }
@ -6178,7 +6178,7 @@ gtk_clist_sort (GtkCList *clist)
thaw = TRUE; thaw = TRUE;
} }
clist->row_list = mergesort (clist, clist->row_list, clist->rows); clist->row_list = my_mergesort (clist, clist->row_list, clist->rows);
work = clist->selection; work = clist->selection;