From ee6029e7f4c0ff674686dffc44cfe16a4bdece10 Mon Sep 17 00:00:00 2001 From: Soeren Sandmann Date: Sun, 10 Nov 2002 20:52:34 +0000 Subject: [PATCH] gtk/gtkradiobutton.c (gtk_radio_button_draw_indicator) Sun Nov 10 21:29:03 2002 Soeren Sandmann * 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 * gtk/gtkwidget.h (struct _GtkWidgetClass): Remove _gtk_reserved8 to restore binary compatibility. --- ChangeLog | 15 +++++++++++++++ ChangeLog.pre-2-10 | 15 +++++++++++++++ ChangeLog.pre-2-2 | 15 +++++++++++++++ ChangeLog.pre-2-4 | 15 +++++++++++++++ ChangeLog.pre-2-6 | 15 +++++++++++++++ ChangeLog.pre-2-8 | 15 +++++++++++++++ gtk/gtkcheckbutton.c | 4 +++- gtk/gtkradiobutton.c | 2 ++ gtk/gtkwidget.h | 1 - 9 files changed, 95 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 64e1fcbe47..5847776b83 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +Sun Nov 10 21:29:03 2002 Soeren Sandmann + + * 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 + + * gtk/gtkwidget.h (struct _GtkWidgetClass): Remove _gtk_reserved8 + to restore binary compatibility. + 2002-11-10 Matthias Clasen * gdk/x11/gdkwindow-x11.c (_gdk_moveresize_handle_event): Fix a diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 64e1fcbe47..5847776b83 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,18 @@ +Sun Nov 10 21:29:03 2002 Soeren Sandmann + + * 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 + + * gtk/gtkwidget.h (struct _GtkWidgetClass): Remove _gtk_reserved8 + to restore binary compatibility. + 2002-11-10 Matthias Clasen * gdk/x11/gdkwindow-x11.c (_gdk_moveresize_handle_event): Fix a diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 64e1fcbe47..5847776b83 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,18 @@ +Sun Nov 10 21:29:03 2002 Soeren Sandmann + + * 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 + + * gtk/gtkwidget.h (struct _GtkWidgetClass): Remove _gtk_reserved8 + to restore binary compatibility. + 2002-11-10 Matthias Clasen * gdk/x11/gdkwindow-x11.c (_gdk_moveresize_handle_event): Fix a diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 64e1fcbe47..5847776b83 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,18 @@ +Sun Nov 10 21:29:03 2002 Soeren Sandmann + + * 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 + + * gtk/gtkwidget.h (struct _GtkWidgetClass): Remove _gtk_reserved8 + to restore binary compatibility. + 2002-11-10 Matthias Clasen * gdk/x11/gdkwindow-x11.c (_gdk_moveresize_handle_event): Fix a diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 64e1fcbe47..5847776b83 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,18 @@ +Sun Nov 10 21:29:03 2002 Soeren Sandmann + + * 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 + + * gtk/gtkwidget.h (struct _GtkWidgetClass): Remove _gtk_reserved8 + to restore binary compatibility. + 2002-11-10 Matthias Clasen * gdk/x11/gdkwindow-x11.c (_gdk_moveresize_handle_event): Fix a diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 64e1fcbe47..5847776b83 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,18 @@ +Sun Nov 10 21:29:03 2002 Soeren Sandmann + + * 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 + + * gtk/gtkwidget.h (struct _GtkWidgetClass): Remove _gtk_reserved8 + to restore binary compatibility. + 2002-11-10 Matthias Clasen * gdk/x11/gdkwindow-x11.c (_gdk_moveresize_handle_event): Fix a diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c index d0667c4bc3..5d3f2af8c0 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 f7feaf0e7c..985c5aad61 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 a16c36a999..f580043f85 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