Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(568)

Unified Diff: chrome/browser/ui/libgtk2ui/menu_util.cc

Issue 1234223005: Initial gtk3 support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Silence gtk memory leak Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/libgtk2ui/gtk2_util.cc ('k') | chrome/browser/ui/libgtk2ui/native_theme_gtk2.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/libgtk2ui/menu_util.cc
diff --git a/chrome/browser/ui/libgtk2ui/menu_util.cc b/chrome/browser/ui/libgtk2ui/menu_util.cc
index 96e0634386773a3b93f3c68c2186ff945bf4a412..6cedac2fa9a75c8feefc2af54c2a0928295e5794 100644
--- a/chrome/browser/ui/libgtk2ui/menu_util.cc
+++ b/chrome/browser/ui/libgtk2ui/menu_util.cc
@@ -12,6 +12,8 @@
#include "ui/base/accelerators/menu_label_accelerator_util_linux.h"
#include "ui/base/models/menu_model.h"
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
namespace libgtk2ui {
GtkWidget* BuildMenuItemWithImage(const std::string& label, GtkWidget* image) {
@@ -139,7 +141,8 @@ void BuildSubmenuFromModel(ui::MenuModel* model,
else
menu_item = BuildMenuItemWithLabel(label);
if (GTK_IS_IMAGE_MENU_ITEM(menu_item)) {
- SetAlwaysShowImage(menu_item);
+ gtk_image_menu_item_set_always_show_image(
+ GTK_IMAGE_MENU_ITEM(menu_item), TRUE);
}
break;
}
« no previous file with comments | « chrome/browser/ui/libgtk2ui/gtk2_util.cc ('k') | chrome/browser/ui/libgtk2ui/native_theme_gtk2.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698