set RECEIVES_DEFAULT on init, and a button press on the widget doesn't

[~andy/gtk] / gtk / gtkoptionmenu.c

diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c
index 9db0dfa8ffca4a79973e6d9535a622a355b13e82..bf42d863e8d27c959783c53029a8747386ef5b5f 100644 (file)
--- a/gtk/gtkoptionmenu.c
+++ b/gtk/gtkoptionmenu.c
@@ -131,7 +131,7 @@ static void
 gtk_option_menu_init (GtkOptionMenu *option_menu)
 {
   GTK_WIDGET_SET_FLAGS (option_menu, GTK_CAN_FOCUS);
-  GTK_WIDGET_UNSET_FLAGS (option_menu, GTK_CAN_DEFAULT);
+  GTK_WIDGET_UNSET_FLAGS (option_menu, GTK_CAN_DEFAULT | GTK_RECEIVES_DEFAULT);
 
   option_menu->menu = NULL;
   option_menu->menu_item = NULL;
@@ -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;