bug 1272194 don't create a label for menu items r=stransky draft
authorKarl Tomlinson <karlt+@karlt.net>
Tue, 17 May 2016 11:02:25 +1200
changeset 368606 02aeda4f9cd8ba7c78c16dcd7f62a90c0733d17c
parent 368605 55d153f6b38b69f575554b841da860124bf7863d
child 368607 8a1a98a46cc80dd6e20b5a1fe0b8ff910c3ee07f
push id18602
push userktomlinson@mozilla.com
push dateThu, 19 May 2016 05:18:04 +0000
reviewersstransky
bugs1272194
milestone49.0a1
bug 1272194 don't create a label for menu items r=stransky The label dates back to GTK2 code and is not currently used. Removing will allow sharing code with menubar item creation. MozReview-Commit-ID: LI5t4agot1z
widget/gtk/gtk3drawing.cpp
widget/gtk/mozgtk/mozgtk.c
--- a/widget/gtk/gtk3drawing.cpp
+++ b/widget/gtk/gtk3drawing.cpp
@@ -540,17 +540,17 @@ ensure_menu_popup_widget()
     return MOZ_GTK_SUCCESS;
 }
 
 static gint
 ensure_menu_item_widget()
 {
     if (!gMenuItemWidget) {
         ensure_menu_popup_widget();
-        gMenuItemWidget = gtk_menu_item_new_with_label("M");
+        gMenuItemWidget = gtk_menu_item_new();
         gtk_menu_shell_append(GTK_MENU_SHELL(gMenuPopupWidget),
                               gMenuItemWidget);
         gtk_widget_realize(gMenuItemWidget);
     }
     return MOZ_GTK_SUCCESS;
 }
 
 static gint
@@ -579,17 +579,17 @@ ensure_menu_separator_widget()
     return MOZ_GTK_SUCCESS;
 }
 
 static gint
 ensure_check_menu_item_widget()
 {
     if (!gCheckMenuItemWidget) {
         ensure_menu_popup_widget();
-        gCheckMenuItemWidget = gtk_check_menu_item_new_with_label("M");
+        gCheckMenuItemWidget = gtk_check_menu_item_new();
         gtk_menu_shell_append(GTK_MENU_SHELL(gMenuPopupWidget),
                               gCheckMenuItemWidget);
         gtk_widget_realize(gCheckMenuItemWidget);
     }
     return MOZ_GTK_SUCCESS;
 }
 
 static gint
--- a/widget/gtk/mozgtk/mozgtk.c
+++ b/widget/gtk/mozgtk/mozgtk.c
@@ -144,17 +144,17 @@ STUB(gtk_bin_get_child)
 STUB(gtk_bin_get_type)
 STUB(gtk_border_free)
 STUB(gtk_box_get_type)
 STUB(gtk_box_pack_start)
 STUB(gtk_button_new)
 STUB(gtk_button_new_with_label)
 STUB(gtk_check_button_new_with_label)
 STUB(gtk_check_button_new_with_mnemonic)
-STUB(gtk_check_menu_item_new_with_label)
+STUB(gtk_check_menu_item_new)
 STUB(gtk_check_version)
 STUB(gtk_clipboard_clear)
 STUB(gtk_clipboard_get)
 STUB(gtk_clipboard_request_contents)
 STUB(gtk_clipboard_request_text)
 STUB(gtk_clipboard_set_can_store)
 STUB(gtk_clipboard_set_with_data)
 STUB(gtk_clipboard_store)
@@ -270,17 +270,16 @@ STUB(gtk_label_set_markup)
 STUB(gtk_link_button_new)
 STUB(gtk_main_do_event)
 STUB(gtk_main_iteration)
 STUB(gtk_menu_attach_to_widget)
 STUB(gtk_menu_bar_new)
 STUB(gtk_menu_get_type)
 STUB(gtk_menu_item_get_type)
 STUB(gtk_menu_item_new)
-STUB(gtk_menu_item_new_with_label)
 STUB(gtk_menu_item_set_submenu)
 STUB(gtk_menu_new)
 STUB(gtk_menu_shell_append)
 STUB(gtk_menu_shell_get_type)
 STUB(gtk_misc_get_alignment)
 STUB(gtk_misc_get_padding)
 STUB(gtk_misc_get_type)
 STUB(gtk_misc_set_alignment)