diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-06-04 22:44:10 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-06-04 22:44:10 +0000 |
| commit | c1ccc9b9a449614b66fa89e43f996801d316432e (patch) | |
| tree | caa957954c84d6b9a5b76c18f808c81c65e4df6c /gtk | |
| parent | 5afcde9a25a01c587af1910df7559f32a694a151 (diff) | |
| download | gtk+-c1ccc9b9a449614b66fa89e43f996801d316432e.tar.gz | |
gtk/gtkradiobutton.c (gtk_radio_button_draw_indicator): Use
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.
Diffstat (limited to 'gtk')
| -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 |
4 files changed, 8 insertions, 2 deletions
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", |