forked from AuroraMiddleware/gtk
Allow gtk_clist_insert() to work on empty lists.
-Marc
This commit is contained in:
parent
84335371b1
commit
7c99ffb891
@ -1,3 +1,8 @@
|
||||
Sun Feb 22 20:42:04 1998 Marc Ewing <marc@redhat.com>
|
||||
|
||||
* gtk/gtkclist.c (gtk_clist_insert): Allow inserts
|
||||
on empty clists.
|
||||
|
||||
Sun Feb 22 14:28:43 1998 Owen Taylor <owt1@cornell.edu>
|
||||
|
||||
* gtk/gtkmain.c (gtk_events_pending): Count idle handlers
|
||||
|
@ -1,3 +1,8 @@
|
||||
Sun Feb 22 20:42:04 1998 Marc Ewing <marc@redhat.com>
|
||||
|
||||
* gtk/gtkclist.c (gtk_clist_insert): Allow inserts
|
||||
on empty clists.
|
||||
|
||||
Sun Feb 22 14:28:43 1998 Owen Taylor <owt1@cornell.edu>
|
||||
|
||||
* gtk/gtkmain.c (gtk_events_pending): Count idle handlers
|
||||
|
@ -1,3 +1,8 @@
|
||||
Sun Feb 22 20:42:04 1998 Marc Ewing <marc@redhat.com>
|
||||
|
||||
* gtk/gtkclist.c (gtk_clist_insert): Allow inserts
|
||||
on empty clists.
|
||||
|
||||
Sun Feb 22 14:28:43 1998 Owen Taylor <owt1@cornell.edu>
|
||||
|
||||
* gtk/gtkmain.c (gtk_events_pending): Count idle handlers
|
||||
|
@ -1,3 +1,8 @@
|
||||
Sun Feb 22 20:42:04 1998 Marc Ewing <marc@redhat.com>
|
||||
|
||||
* gtk/gtkclist.c (gtk_clist_insert): Allow inserts
|
||||
on empty clists.
|
||||
|
||||
Sun Feb 22 14:28:43 1998 Owen Taylor <owt1@cornell.edu>
|
||||
|
||||
* gtk/gtkmain.c (gtk_events_pending): Count idle handlers
|
||||
|
@ -1,3 +1,8 @@
|
||||
Sun Feb 22 20:42:04 1998 Marc Ewing <marc@redhat.com>
|
||||
|
||||
* gtk/gtkclist.c (gtk_clist_insert): Allow inserts
|
||||
on empty clists.
|
||||
|
||||
Sun Feb 22 14:28:43 1998 Owen Taylor <owt1@cornell.edu>
|
||||
|
||||
* gtk/gtkmain.c (gtk_events_pending): Count idle handlers
|
||||
|
@ -1,3 +1,8 @@
|
||||
Sun Feb 22 20:42:04 1998 Marc Ewing <marc@redhat.com>
|
||||
|
||||
* gtk/gtkclist.c (gtk_clist_insert): Allow inserts
|
||||
on empty clists.
|
||||
|
||||
Sun Feb 22 14:28:43 1998 Owen Taylor <owt1@cornell.edu>
|
||||
|
||||
* gtk/gtkmain.c (gtk_events_pending): Count idle handlers
|
||||
|
@ -1,3 +1,8 @@
|
||||
Sun Feb 22 20:42:04 1998 Marc Ewing <marc@redhat.com>
|
||||
|
||||
* gtk/gtkclist.c (gtk_clist_insert): Allow inserts
|
||||
on empty clists.
|
||||
|
||||
Sun Feb 22 14:28:43 1998 Owen Taylor <owt1@cornell.edu>
|
||||
|
||||
* gtk/gtkmain.c (gtk_events_pending): Count idle handlers
|
||||
|
@ -1221,26 +1221,31 @@ gtk_clist_insert (GtkCList * clist,
|
||||
g_return_if_fail (text != NULL);
|
||||
|
||||
/* return if out of bounds */
|
||||
if (row < 0 || row > (clist->rows - 1))
|
||||
if (row < 0 || row > clist->rows)
|
||||
return;
|
||||
|
||||
/* create the row */
|
||||
clist_row = row_new (clist);
|
||||
|
||||
/* set the text in the row's columns */
|
||||
if (text)
|
||||
for (i = 0; i < clist->columns; i++)
|
||||
if (text[i])
|
||||
cell_set_text (clist, clist_row, i, text[i]);
|
||||
|
||||
/* reset the row end pointer if we're inserting at the
|
||||
* end of the list */
|
||||
if (row == clist->rows)
|
||||
clist->row_list_end = (g_list_append (clist->row_list_end, clist_row))->next;
|
||||
if (clist->rows == 0)
|
||||
gtk_clist_append (clist, text);
|
||||
else
|
||||
clist->row_list = g_list_insert (clist->row_list, clist_row, row);
|
||||
{
|
||||
/* create the row */
|
||||
clist_row = row_new (clist);
|
||||
|
||||
clist->rows++;
|
||||
/* set the text in the row's columns */
|
||||
if (text)
|
||||
for (i = 0; i < clist->columns; i++)
|
||||
if (text[i])
|
||||
cell_set_text (clist, clist_row, i, text[i]);
|
||||
|
||||
/* reset the row end pointer if we're inserting at the
|
||||
* end of the list */
|
||||
if (row == clist->rows)
|
||||
clist->row_list_end = (g_list_append (clist->row_list_end, clist_row))->next;
|
||||
else
|
||||
clist->row_list = g_list_insert (clist->row_list, clist_row, row);
|
||||
|
||||
clist->rows++;
|
||||
}
|
||||
|
||||
/* redraw the list if it isn't frozen */
|
||||
if (!GTK_CLIST_FROZEN (clist))
|
||||
|
Loading…
Reference in New Issue
Block a user