diff options
| author | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-28 21:15:56 +0000 |
|---|---|---|
| committer | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-28 21:15:56 +0000 |
| commit | 65d55d8a39fa6d3438b8b14f4b7a5bd961728142 (patch) | |
| tree | 6c7dbb6c681c9221a44b91344c5ceda53db35f4a /chrome/browser/gtk | |
| parent | 1c48541e7a183a418dca7f98a42a72723c178f81 (diff) | |
| download | chromium_src-65d55d8a39fa6d3438b8b14f4b7a5bd961728142.zip chromium_src-65d55d8a39fa6d3438b8b14f4b7a5bd961728142.tar.gz chromium_src-65d55d8a39fa6d3438b8b14f4b7a5bd961728142.tar.bz2 | |
Assorted fixes for 64-bit.
Review URL: http://codereview.chromium.org/160288
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21891 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk')
| -rw-r--r-- | chrome/browser/gtk/bookmark_manager_gtk.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/gtk/menu_gtk.cc | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/gtk/bookmark_manager_gtk.cc b/chrome/browser/gtk/bookmark_manager_gtk.cc index ef58e88..a59e8ab 100644 --- a/chrome/browser/gtk/bookmark_manager_gtk.cc +++ b/chrome/browser/gtk/bookmark_manager_gtk.cc @@ -1273,7 +1273,7 @@ void BookmarkManagerGtk::OnExportItemActivated(GtkMenuItem* menuitem, void BookmarkManagerGtk::FileSelected(const FilePath& path, int index, void* params) { - int id = reinterpret_cast<int>(params); + int id = reinterpret_cast<intptr_t>(params); if (id == IDS_BOOKMARK_MANAGER_IMPORT_MENU) { // ImporterHost is ref counted and will delete itself when done. ImporterHost* host = new ImporterHost(); diff --git a/chrome/browser/gtk/menu_gtk.cc b/chrome/browser/gtk/menu_gtk.cc index 9826110..f1b8f9a 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)) { |