Return TRUE for button press events we handle. (Allows option menus in

Tue Dec 22 15:55:39 1998  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkoptionmenu.c (gtk_option_menu_button_press):
	Return TRUE for button press events we handle.
	(Allows option menus in radio buttons to work...)

diff --git a/ChangeLog b/ChangeLog
index 4d1b69d7b913315e00622692fec85de4a8024c10..4d3f601f7e31915eee066b0df678f5a38e957392 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Dec 22 15:55:39 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkoptionmenu.c (gtk_option_menu_button_press): 
+       Return TRUE for button press events we handle.
+       (Allows option menus in radio buttons to work...)
+
 Tue Dec 22 14:50:25 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.c (gtk_drag_find_widget): Optimization -

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 4d1b69d7b913315e00622692fec85de4a8024c10..4d3f601f7e31915eee066b0df678f5a38e957392 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Tue Dec 22 15:55:39 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkoptionmenu.c (gtk_option_menu_button_press): 
+       Return TRUE for button press events we handle.
+       (Allows option menus in radio buttons to work...)
+
 Tue Dec 22 14:50:25 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.c (gtk_drag_find_widget): Optimization -

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4d1b69d7b913315e00622692fec85de4a8024c10..4d3f601f7e31915eee066b0df678f5a38e957392 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Tue Dec 22 15:55:39 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkoptionmenu.c (gtk_option_menu_button_press): 
+       Return TRUE for button press events we handle.
+       (Allows option menus in radio buttons to work...)
+
 Tue Dec 22 14:50:25 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.c (gtk_drag_find_widget): Optimization -

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 4d1b69d7b913315e00622692fec85de4a8024c10..4d3f601f7e31915eee066b0df678f5a38e957392 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Tue Dec 22 15:55:39 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkoptionmenu.c (gtk_option_menu_button_press): 
+       Return TRUE for button press events we handle.
+       (Allows option menus in radio buttons to work...)
+
 Tue Dec 22 14:50:25 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.c (gtk_drag_find_widget): Optimization -

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 4d1b69d7b913315e00622692fec85de4a8024c10..4d3f601f7e31915eee066b0df678f5a38e957392 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Tue Dec 22 15:55:39 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkoptionmenu.c (gtk_option_menu_button_press): 
+       Return TRUE for button press events we handle.
+       (Allows option menus in radio buttons to work...)
+
 Tue Dec 22 14:50:25 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.c (gtk_drag_find_widget): Optimization -

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4d1b69d7b913315e00622692fec85de4a8024c10..4d3f601f7e31915eee066b0df678f5a38e957392 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Tue Dec 22 15:55:39 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkoptionmenu.c (gtk_option_menu_button_press): 
+       Return TRUE for button press events we handle.
+       (Allows option menus in radio buttons to work...)
+
 Tue Dec 22 14:50:25 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.c (gtk_drag_find_widget): Optimization -

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4d1b69d7b913315e00622692fec85de4a8024c10..4d3f601f7e31915eee066b0df678f5a38e957392 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Tue Dec 22 15:55:39 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkoptionmenu.c (gtk_option_menu_button_press): 
+       Return TRUE for button press events we handle.
+       (Allows option menus in radio buttons to work...)
+
 Tue Dec 22 14:50:25 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.c (gtk_drag_find_widget): Optimization -

diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c
index 9db0dfa8ffca4a79973e6d9535a622a355b13e82..025331db478f9bb3cada0955a46fcc6c896b1169 100644 (file)
--- a/gtk/gtkoptionmenu.c
+++ b/gtk/gtkoptionmenu.c
@@ -471,6 +471,7 @@ gtk_option_menu_button_press (GtkWidget      *widget,
       gtk_menu_popup (GTK_MENU (option_menu->menu), NULL, NULL,
                      gtk_option_menu_position, option_menu,
                      event->button, event->time);
+      return TRUE;
     }
 
   return FALSE;
@@ -495,7 +496,7 @@ gtk_option_menu_key_press (GtkWidget   *widget,
       gtk_menu_popup (GTK_MENU (option_menu->menu), NULL, NULL,
                      gtk_option_menu_position, option_menu,
                      0, event->time);
-      break;
+      return TRUE;
     }
   
   return FALSE;