diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 11 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 11 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 11 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 11 | ||||
| -rw-r--r-- | gtk/gtkcheckbutton.c | 2 | ||||
| -rw-r--r-- | gtk/gtkcheckmenuitem.c | 3 | ||||
| -rw-r--r-- | gtk/gtkradiobutton.c | 2 | ||||
| -rw-r--r-- | gtk/gtkradiomenuitem.c | 3 |
9 files changed, 63 insertions, 2 deletions
@@ -1,3 +1,14 @@ +Wed Jun 4 18:27:44 2003 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkcheckbutton.c (gtk_real_check_button_draw_indicator): + gtk/gtkradiobutton.c (gtk_radio_button_draw_indicator): + Use GTK_WIDGET_IS_SENSITIVE(), not GTK_WIDGET_SENSITIVE + (#92548, Tim Evans) + + * gtk/gtkcheckmenuitem.c (gtk_real_check_menu_item_draw_indicator) + gtk/gtkradiomenuitem.c (gtk_radio_menu_item_draw_indicator): If + Use state_type = STATE_INSENSITIVE for insensitive menu items. + Wed Jun 4 21:25:35 2003 Kristian Rietveld <kris@gtk.org> Merged from stable. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e8c95347c1..3b6934c65e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,14 @@ +Wed Jun 4 18:27:44 2003 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkcheckbutton.c (gtk_real_check_button_draw_indicator): + gtk/gtkradiobutton.c (gtk_radio_button_draw_indicator): + Use GTK_WIDGET_IS_SENSITIVE(), not GTK_WIDGET_SENSITIVE + (#92548, Tim Evans) + + * gtk/gtkcheckmenuitem.c (gtk_real_check_menu_item_draw_indicator) + gtk/gtkradiomenuitem.c (gtk_radio_menu_item_draw_indicator): If + Use state_type = STATE_INSENSITIVE for insensitive menu items. + Wed Jun 4 21:25:35 2003 Kristian Rietveld <kris@gtk.org> Merged from stable. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index e8c95347c1..3b6934c65e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,14 @@ +Wed Jun 4 18:27:44 2003 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkcheckbutton.c (gtk_real_check_button_draw_indicator): + gtk/gtkradiobutton.c (gtk_radio_button_draw_indicator): + Use GTK_WIDGET_IS_SENSITIVE(), not GTK_WIDGET_SENSITIVE + (#92548, Tim Evans) + + * gtk/gtkcheckmenuitem.c (gtk_real_check_menu_item_draw_indicator) + gtk/gtkradiomenuitem.c (gtk_radio_menu_item_draw_indicator): If + Use state_type = STATE_INSENSITIVE for insensitive menu items. + Wed Jun 4 21:25:35 2003 Kristian Rietveld <kris@gtk.org> Merged from stable. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e8c95347c1..3b6934c65e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,14 @@ +Wed Jun 4 18:27:44 2003 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkcheckbutton.c (gtk_real_check_button_draw_indicator): + gtk/gtkradiobutton.c (gtk_radio_button_draw_indicator): + Use GTK_WIDGET_IS_SENSITIVE(), not GTK_WIDGET_SENSITIVE + (#92548, Tim Evans) + + * gtk/gtkcheckmenuitem.c (gtk_real_check_menu_item_draw_indicator) + gtk/gtkradiomenuitem.c (gtk_radio_menu_item_draw_indicator): If + Use state_type = STATE_INSENSITIVE for insensitive menu items. + Wed Jun 4 21:25:35 2003 Kristian Rietveld <kris@gtk.org> Merged from stable. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e8c95347c1..3b6934c65e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,14 @@ +Wed Jun 4 18:27:44 2003 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkcheckbutton.c (gtk_real_check_button_draw_indicator): + gtk/gtkradiobutton.c (gtk_radio_button_draw_indicator): + Use GTK_WIDGET_IS_SENSITIVE(), not GTK_WIDGET_SENSITIVE + (#92548, Tim Evans) + + * gtk/gtkcheckmenuitem.c (gtk_real_check_menu_item_draw_indicator) + gtk/gtkradiomenuitem.c (gtk_radio_menu_item_draw_indicator): If + Use state_type = STATE_INSENSITIVE for insensitive menu items. + Wed Jun 4 21:25:35 2003 Kristian Rietveld <kris@gtk.org> Merged from stable. diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c index 5d3f2af8c0..da58bb70bd 100644 --- a/gtk/gtkcheckbutton.c +++ b/gtk/gtkcheckbutton.c @@ -415,7 +415,7 @@ gtk_real_check_button_draw_indicator (GtkCheckButton *check_button, state_type = GTK_STATE_ACTIVE; else if (button->in_button) state_type = GTK_STATE_PRELIGHT; - else if (!GTK_WIDGET_SENSITIVE (widget)) + else if (!GTK_WIDGET_IS_SENSITIVE (widget)) state_type = GTK_STATE_INSENSITIVE; else state_type = GTK_STATE_NORMAL; diff --git a/gtk/gtkcheckmenuitem.c b/gtk/gtkcheckmenuitem.c index daf6a37259..269b1efe88 100644 --- a/gtk/gtkcheckmenuitem.c +++ b/gtk/gtkcheckmenuitem.c @@ -390,6 +390,9 @@ gtk_real_check_menu_item_draw_indicator (GtkCheckMenuItem *check_menu_item, if (state_type == GTK_STATE_ACTIVE) state_type = GTK_STATE_NORMAL; } + + if (!GTK_WIDGET_IS_SENSITIVE (widget)) + state_type = GTK_STATE_INSENSITIVE; gtk_paint_check (widget->style, widget->window, state_type, shadow_type, diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c index 985c5aad61..c1c25ddab2 100644 --- a/gtk/gtkradiobutton.c +++ b/gtk/gtkradiobutton.c @@ -642,7 +642,7 @@ gtk_radio_button_draw_indicator (GtkCheckButton *check_button, state_type = GTK_STATE_ACTIVE; else if (button->in_button) state_type = GTK_STATE_PRELIGHT; - else if (!GTK_WIDGET_SENSITIVE (widget)) + else if (!GTK_WIDGET_IS_SENSITIVE (widget)) state_type = GTK_STATE_INSENSITIVE; else state_type = GTK_STATE_NORMAL; diff --git a/gtk/gtkradiomenuitem.c b/gtk/gtkradiomenuitem.c index 410984f19b..87ac5052e4 100644 --- a/gtk/gtkradiomenuitem.c +++ b/gtk/gtkradiomenuitem.c @@ -338,6 +338,9 @@ gtk_radio_menu_item_draw_indicator (GtkCheckMenuItem *check_menu_item, if (check_menu_item->inconsistent) shadow_type = GTK_SHADOW_ETCHED_IN; + if (!GTK_WIDGET_IS_SENSITIVE (widget)) + state_type = GTK_STATE_INSENSITIVE; + gtk_paint_option (widget->style, widget->window, state_type, shadow_type, area, widget, "option", |