callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed my_merge and my_mergesort to gtk_clist_merge and

Browse Source 
Thu Aug  6 22:37:21 1998  Stefan Jeske  <stefan@gtk.org>

	* gtk/gtkclist.c: Renamed my_merge and my_mergesort to
 	gtk_clist_merge and gtk_clist_mergesort. :)
This commit is contained in:
Stefan Jeske 1998-08-06 20:49:24 +00:00 committed by Stefan Jeske
parent 2a98c4a504
commit b7afebffed
8 changed files with 54 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu Aug 6 22:37:21 1998 Stefan Jeske <stefan@gtk.org>
* gtk/gtkclist.c: Renamed my_merge and my_mergesort to
gtk_clist_merge and gtk_clist_mergesort. :)
1998-08-06 Martin Baulig <martin@home-of-linux.org>
* gtk/gtkclist.c: Renamed `merge' -> `my_merge' and

5
ChangeLog.pre-2-0
View File

@ -1,3 +1,8 @@
Thu Aug 6 22:37:21 1998 Stefan Jeske <stefan@gtk.org>
* gtk/gtkclist.c: Renamed my_merge and my_mergesort to
gtk_clist_merge and gtk_clist_mergesort. :)
1998-08-06 Martin Baulig <martin@home-of-linux.org>
* gtk/gtkclist.c: Renamed `merge' -> `my_merge' and

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
Thu Aug 6 22:37:21 1998 Stefan Jeske <stefan@gtk.org>
* gtk/gtkclist.c: Renamed my_merge and my_mergesort to
gtk_clist_merge and gtk_clist_mergesort. :)
1998-08-06 Martin Baulig <martin@home-of-linux.org>
* gtk/gtkclist.c: Renamed `merge' -> `my_merge' and

5
ChangeLog.pre-2-2
View File

@ -1,3 +1,8 @@
Thu Aug 6 22:37:21 1998 Stefan Jeske <stefan@gtk.org>
* gtk/gtkclist.c: Renamed my_merge and my_mergesort to
gtk_clist_merge and gtk_clist_mergesort. :)
1998-08-06 Martin Baulig <martin@home-of-linux.org>
* gtk/gtkclist.c: Renamed `merge' -> `my_merge' and

5
ChangeLog.pre-2-4
View File

@ -1,3 +1,8 @@
Thu Aug 6 22:37:21 1998 Stefan Jeske <stefan@gtk.org>
* gtk/gtkclist.c: Renamed my_merge and my_mergesort to
gtk_clist_merge and gtk_clist_mergesort. :)
1998-08-06 Martin Baulig <martin@home-of-linux.org>
* gtk/gtkclist.c: Renamed `merge' -> `my_merge' and

5
ChangeLog.pre-2-6
View File

@ -1,3 +1,8 @@
Thu Aug 6 22:37:21 1998 Stefan Jeske <stefan@gtk.org>
* gtk/gtkclist.c: Renamed my_merge and my_mergesort to
gtk_clist_merge and gtk_clist_mergesort. :)
1998-08-06 Martin Baulig <martin@home-of-linux.org>
* gtk/gtkclist.c: Renamed `merge' -> `my_merge' and

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
Thu Aug 6 22:37:21 1998 Stefan Jeske <stefan@gtk.org>
* gtk/gtkclist.c: Renamed my_merge and my_mergesort to
gtk_clist_merge and gtk_clist_mergesort. :)
1998-08-06 Martin Baulig <martin@home-of-linux.org>
* gtk/gtkclist.c: Renamed `merge' -> `my_merge' and

16
gtk/gtkclist.c
View File

@ -354,10 +354,10 @@ static void extend_selection (GtkCList *clist,
static gint default_compare (GtkCList *clist,
gconstpointer row1,
gconstpointer row2);
static GList * my_merge (GtkCList *clist,
static GList * gtk_clist_merge (GtkCList *clist,
GList *a,
GList *b);
static GList * my_mergesort (GtkCList *clist,
static GList * gtk_clist_mergesort (GtkCList *clist,
GList *list,
gint num);
@ -6063,7 +6063,7 @@ gtk_clist_set_sort_column (GtkCList *clist,
}
static GList *
my_merge (GtkCList *clist,
gtk_clist_merge (GtkCList *clist,
GList *a, /* first list to merge */
GList *b) /* second list to merge */
{
@ -6117,7 +6117,7 @@ my_merge (GtkCList *clist,
}
static GList *
my_mergesort (GtkCList *clist,
gtk_clist_mergesort (GtkCList *clist,
GList *list, /* the list to sort */
gint num) /* the list's length */
{
@ -6140,9 +6140,9 @@ my_mergesort (GtkCList *clist,
half->prev = NULL;
/* recursively sort both lists */
return my_merge (clist,
my_mergesort (clist, list, num / 2),
my_mergesort (clist, half, num - num / 2));
return gtk_clist_merge (clist,
gtk_clist_mergesort (clist, list, num / 2),
gtk_clist_mergesort (clist, half, num - num / 2));
}
}
@ -6178,7 +6178,7 @@ gtk_clist_sort (GtkCList *clist)
thaw = TRUE;
}
clist->row_list = my_mergesort (clist, clist->row_list, clist->rows);
clist->row_list = gtk_clist_mergesort (clist, clist->row_list, clist->rows);
work = clist->selection;