diff --git a/ChangeLog b/ChangeLog index f3097e17a1..d3ecbd46f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Dec 3 16:37:42 1998 Owen Taylor + + * gtk/gtkclist.c (get_cell_style): Use GTK_STATE_INSENSITIVE + for the foreground of cells for CLists in the insensitive + state, instead of GTK_STATE_PRELIGHT. + Thu Dec 3 06:20:59 1998 Tim Janik * gtk/gtkwindow.c: moved checks upon focus setting from diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index f3097e17a1..d3ecbd46f5 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Thu Dec 3 16:37:42 1998 Owen Taylor + + * gtk/gtkclist.c (get_cell_style): Use GTK_STATE_INSENSITIVE + for the foreground of cells for CLists in the insensitive + state, instead of GTK_STATE_PRELIGHT. + Thu Dec 3 06:20:59 1998 Tim Janik * gtk/gtkwindow.c: moved checks upon focus setting from diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f3097e17a1..d3ecbd46f5 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Thu Dec 3 16:37:42 1998 Owen Taylor + + * gtk/gtkclist.c (get_cell_style): Use GTK_STATE_INSENSITIVE + for the foreground of cells for CLists in the insensitive + state, instead of GTK_STATE_PRELIGHT. + Thu Dec 3 06:20:59 1998 Tim Janik * gtk/gtkwindow.c: moved checks upon focus setting from diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index f3097e17a1..d3ecbd46f5 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Thu Dec 3 16:37:42 1998 Owen Taylor + + * gtk/gtkclist.c (get_cell_style): Use GTK_STATE_INSENSITIVE + for the foreground of cells for CLists in the insensitive + state, instead of GTK_STATE_PRELIGHT. + Thu Dec 3 06:20:59 1998 Tim Janik * gtk/gtkwindow.c: moved checks upon focus setting from diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index f3097e17a1..d3ecbd46f5 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Thu Dec 3 16:37:42 1998 Owen Taylor + + * gtk/gtkclist.c (get_cell_style): Use GTK_STATE_INSENSITIVE + for the foreground of cells for CLists in the insensitive + state, instead of GTK_STATE_PRELIGHT. + Thu Dec 3 06:20:59 1998 Tim Janik * gtk/gtkwindow.c: moved checks upon focus setting from diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f3097e17a1..d3ecbd46f5 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Thu Dec 3 16:37:42 1998 Owen Taylor + + * gtk/gtkclist.c (get_cell_style): Use GTK_STATE_INSENSITIVE + for the foreground of cells for CLists in the insensitive + state, instead of GTK_STATE_PRELIGHT. + Thu Dec 3 06:20:59 1998 Tim Janik * gtk/gtkwindow.c: moved checks upon focus setting from diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f3097e17a1..d3ecbd46f5 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Thu Dec 3 16:37:42 1998 Owen Taylor + + * gtk/gtkclist.c (get_cell_style): Use GTK_STATE_INSENSITIVE + for the foreground of cells for CLists in the insensitive + state, instead of GTK_STATE_PRELIGHT. + Thu Dec 3 06:20:59 1998 Tim Janik * gtk/gtkwindow.c: moved checks upon focus setting from diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c index 4cb18d030c..08dabda04d 100644 --- a/gtk/gtkclist.c +++ b/gtk/gtkclist.c @@ -5401,12 +5401,20 @@ get_cell_style (GtkCList *clist, GdkGC **fg_gc, GdkGC **bg_gc) { + gint fg_state; + + if ((state == GTK_STATE_PRELIGHT) && + (GTK_WIDGET (clist)->state == GTK_STATE_INSENSITIVE)) + fg_state = GTK_STATE_INSENSITIVE; + else + fg_state = state; + if (clist_row->cell[column].style) { if (style) *style = clist_row->cell[column].style; if (fg_gc) - *fg_gc = clist_row->cell[column].style->fg_gc[state]; + *fg_gc = clist_row->cell[column].style->fg_gc[fg_state]; if (bg_gc) *bg_gc = clist_row->cell[column].style->bg_gc[state]; } @@ -5415,7 +5423,7 @@ get_cell_style (GtkCList *clist, if (style) *style = clist_row->style; if (fg_gc) - *fg_gc = clist_row->style->fg_gc[state]; + *fg_gc = clist_row->style->fg_gc[fg_state]; if (bg_gc) *bg_gc = clist_row->style->bg_gc[state]; } @@ -5424,7 +5432,7 @@ get_cell_style (GtkCList *clist, if (style) *style = GTK_WIDGET (clist)->style; if (fg_gc) - *fg_gc = GTK_WIDGET (clist)->style->fg_gc[state]; + *fg_gc = GTK_WIDGET (clist)->style->fg_gc[fg_state]; if (bg_gc) *bg_gc = GTK_WIDGET (clist)->style->bg_gc[state];