From aba1c9a76e4d3db7d1a02b4b09a7413433790fd5 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sat, 2 Mar 2002 21:18:07 +0000 Subject: [PATCH] Don't do special focus handling if draw_indicator is not set. (#64723, Sat Mar 2 16:12:03 2002 Owen Taylor * gtk/gtkradiobutton.c (gtk_radio_button_focus): Don't do special focus handling if draw_indicator is not set. (#64723, Damon Chaplin.) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkradiobutton.c | 6 ++++++ 8 files changed, 48 insertions(+) diff --git a/ChangeLog b/ChangeLog index e1a60c606..24b0b35f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Mar 2 16:12:03 2002 Owen Taylor + + * gtk/gtkradiobutton.c (gtk_radio_button_focus): Don't + do special focus handling if draw_indicator is not set. + (#64723, Damon Chaplin.) + Sat Mar 2 15:48:04 2002 Owen Taylor * gtk/gtkentry.c (gtk_entry_new_with_max_length, diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index e1a60c606..24b0b35f6 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Sat Mar 2 16:12:03 2002 Owen Taylor + + * gtk/gtkradiobutton.c (gtk_radio_button_focus): Don't + do special focus handling if draw_indicator is not set. + (#64723, Damon Chaplin.) + Sat Mar 2 15:48:04 2002 Owen Taylor * gtk/gtkentry.c (gtk_entry_new_with_max_length, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e1a60c606..24b0b35f6 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sat Mar 2 16:12:03 2002 Owen Taylor + + * gtk/gtkradiobutton.c (gtk_radio_button_focus): Don't + do special focus handling if draw_indicator is not set. + (#64723, Damon Chaplin.) + Sat Mar 2 15:48:04 2002 Owen Taylor * gtk/gtkentry.c (gtk_entry_new_with_max_length, diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index e1a60c606..24b0b35f6 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Sat Mar 2 16:12:03 2002 Owen Taylor + + * gtk/gtkradiobutton.c (gtk_radio_button_focus): Don't + do special focus handling if draw_indicator is not set. + (#64723, Damon Chaplin.) + Sat Mar 2 15:48:04 2002 Owen Taylor * gtk/gtkentry.c (gtk_entry_new_with_max_length, diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index e1a60c606..24b0b35f6 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Sat Mar 2 16:12:03 2002 Owen Taylor + + * gtk/gtkradiobutton.c (gtk_radio_button_focus): Don't + do special focus handling if draw_indicator is not set. + (#64723, Damon Chaplin.) + Sat Mar 2 15:48:04 2002 Owen Taylor * gtk/gtkentry.c (gtk_entry_new_with_max_length, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e1a60c606..24b0b35f6 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sat Mar 2 16:12:03 2002 Owen Taylor + + * gtk/gtkradiobutton.c (gtk_radio_button_focus): Don't + do special focus handling if draw_indicator is not set. + (#64723, Damon Chaplin.) + Sat Mar 2 15:48:04 2002 Owen Taylor * gtk/gtkentry.c (gtk_entry_new_with_max_length, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e1a60c606..24b0b35f6 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sat Mar 2 16:12:03 2002 Owen Taylor + + * gtk/gtkradiobutton.c (gtk_radio_button_focus): Don't + do special focus handling if draw_indicator is not set. + (#64723, Damon Chaplin.) + Sat Mar 2 15:48:04 2002 Owen Taylor * gtk/gtkentry.c (gtk_entry_new_with_max_length, diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c index 50498e929..deb0ba237 100644 --- a/gtk/gtkradiobutton.c +++ b/gtk/gtkradiobutton.c @@ -387,6 +387,12 @@ gtk_radio_button_focus (GtkWidget *widget, { GtkRadioButton *radio_button = GTK_RADIO_BUTTON (widget); GSList *tmp_slist; + + /* Radio buttons with draw_indicator unset focus "normally", since + * they look like buttons to the user. + */ + if (!GTK_TOGGLE_BUTTON (widget)->draw_indicator) + return GTK_WIDGET_CLASS (parent_class)->focus (widget, direction); if (gtk_widget_is_focus (widget)) { -- 2.43.2