summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorSoeren Sandmann <sandmann@daimi.au.dk>2002-11-10 20:52:34 +0000
committerSøren Sandmann Pedersen <ssp@src.gnome.org>2002-11-10 20:52:34 +0000
commitee6029e7f4c0ff674686dffc44cfe16a4bdece10 (patch)
treecd829c8e2ebb6e2adbe1a76978d31ec1a5586d67 /gtk
parentac116999c28ccfdf93210e8fa261bb7637411c25 (diff)
downloadgdk-pixbuf-ee6029e7f4c0ff674686dffc44cfe16a4bdece10.tar.gz
gtk/gtkradiobutton.c (gtk_radio_button_draw_indicator)
Sun Nov 10 21:29:03 2002 Soeren Sandmann <sandmann@daimi.au.dk> * gtk/gtkcheckbutton.c (gtk_real_check_button_draw_indicator): * gtk/gtkradiobutton.c (gtk_radio_button_draw_indicator) Make sure check and option marks are drawn insensitive when the widgets are insensitive. (#92548, patch from Tim Evans) Sun Nov 10 21:25:04 2002 Soeren Sandmann <sandmann@daimi.au.dk> * gtk/gtkwidget.h (struct _GtkWidgetClass): Remove _gtk_reserved8 to restore binary compatibility.
Diffstat (limited to 'gtk')
-rw-r--r--gtk/gtkcheckbutton.c4
-rw-r--r--gtk/gtkradiobutton.c2
-rw-r--r--gtk/gtkwidget.h1
3 files changed, 5 insertions, 2 deletions
diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c
index d0667c4bc..5d3f2af8c 100644
--- a/gtk/gtkcheckbutton.c
+++ b/gtk/gtkcheckbutton.c
@@ -415,6 +415,8 @@ 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))
+ state_type = GTK_STATE_INSENSITIVE;
else
state_type = GTK_STATE_NORMAL;
@@ -440,7 +442,7 @@ gtk_real_check_button_draw_indicator (GtkCheckButton *check_button,
new_area.width, new_area.height);
}
}
-
+
gtk_paint_check (widget->style, widget->window,
state_type, shadow_type,
area, widget, "checkbutton",
diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c
index f7feaf0e7..985c5aad6 100644
--- a/gtk/gtkradiobutton.c
+++ b/gtk/gtkradiobutton.c
@@ -642,6 +642,8 @@ 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))
+ state_type = GTK_STATE_INSENSITIVE;
else
state_type = GTK_STATE_NORMAL;
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index a16c36a99..f580043f8 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -408,7 +408,6 @@ struct _GtkWidgetClass
void (*_gtk_reserved5) (void);
void (*_gtk_reserved6) (void);
void (*_gtk_reserved7) (void);
- void (*_gtk_reserved8) (void);
};
struct _GtkWidgetAuxInfo