Don't do special focus handling if draw_indicator is not set. (#64723,

Sat Mar  2 16:12:03 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkradiobutton.c (gtk_radio_button_focus): Don't
        do special focus handling if draw_indicator is not set.
        (#64723, Damon Chaplin.)

diff --git a/ChangeLog b/ChangeLog
index e1a60c606f667c9c4842c48593f220c4642b850c..24b0b35f6dc683ab20619a2965586eabf9baf637 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Mar  2 16:12:03 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_new_with_max_length,

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index e1a60c606f667c9c4842c48593f220c4642b850c..24b0b35f6dc683ab20619a2965586eabf9baf637 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Sat Mar  2 16:12:03 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_new_with_max_length,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e1a60c606f667c9c4842c48593f220c4642b850c..24b0b35f6dc683ab20619a2965586eabf9baf637 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sat Mar  2 16:12:03 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_new_with_max_length,

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index e1a60c606f667c9c4842c48593f220c4642b850c..24b0b35f6dc683ab20619a2965586eabf9baf637 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Sat Mar  2 16:12:03 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_new_with_max_length,

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e1a60c606f667c9c4842c48593f220c4642b850c..24b0b35f6dc683ab20619a2965586eabf9baf637 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Sat Mar  2 16:12:03 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_new_with_max_length,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e1a60c606f667c9c4842c48593f220c4642b850c..24b0b35f6dc683ab20619a2965586eabf9baf637 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sat Mar  2 16:12:03 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_new_with_max_length,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e1a60c606f667c9c4842c48593f220c4642b850c..24b0b35f6dc683ab20619a2965586eabf9baf637 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sat Mar  2 16:12:03 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_new_with_max_length,

diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c
index 50498e929b60209e6511979384e890cfa79798d0..deb0ba237ba61f470d6507ab14d08d28dbf89e55 100644 (file)
--- 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))
     {