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

Unified Diff: chrome/browser/gtk/menu_gtk.cc

Issue 160288: Assorted fixes for 64-bit. (Closed)
Patch Set: Created 11 years, 5 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
Index: chrome/browser/gtk/menu_gtk.cc
diff --git a/chrome/browser/gtk/menu_gtk.cc b/chrome/browser/gtk/menu_gtk.cc
index 982611078f8e0a2bc526a72a93fb925b5765656f..f1b8f9abde32f858ccb25bd85074562d80f8476d 100644
--- a/chrome/browser/gtk/menu_gtk.cc
+++ b/chrome/browser/gtk/menu_gtk.cc
@@ -233,8 +233,8 @@ void MenuGtk::OnMenuItemActivated(GtkMenuItem* menuitem, MenuGtk* menu) {
if (data) {
id = data->id;
} else {
- id = reinterpret_cast<int>(g_object_get_data(G_OBJECT(menuitem),
- "menu-id"));
+ id = reinterpret_cast<intptr_t>(g_object_get_data(G_OBJECT(menuitem),
+ "menu-id"));
}
// The menu item can still be activated by hotkeys even if it is disabled.
@@ -309,8 +309,8 @@ void MenuGtk::SetMenuItemInfo(GtkWidget* widget, gpointer userdata) {
if (data) {
id = data->id;
} else {
- id = reinterpret_cast<int>(
- g_object_get_data(G_OBJECT(widget), "menu-id"));
+ id = reinterpret_cast<intptr_t>(g_object_get_data(G_OBJECT(widget),
+ "menu-id"));
}
if (GTK_IS_CHECK_MENU_ITEM(widget)) {

Powered by Google App Engine
This is Rietveld 408576698