summaryrefslogtreecommitdiffstats
path: root/views/controls
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-09 16:34:37 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-09 16:34:37 +0000
commit6b606125caa86980e660b441a1a0ca3d4c19bd50 (patch)
treecc8bf5a860f4f1f60f7e84f09888c006920547fd /views/controls
parentb32f619a78cba0d2d79e1984e4a791d3d229e432 (diff)
downloadchromium_src-6b606125caa86980e660b441a1a0ca3d4c19bd50.zip
chromium_src-6b606125caa86980e660b441a1a0ca3d4c19bd50.tar.gz
chromium_src-6b606125caa86980e660b441a1a0ca3d4c19bd50.tar.bz2
Fixes compile error in NativeMenuGtk when building for 64 bit.
BUG=none TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28544 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls')
-rw-r--r--views/controls/menu/native_menu_gtk.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/views/controls/menu/native_menu_gtk.cc b/views/controls/menu/native_menu_gtk.cc
index cc78fb2..aea28b0 100644
--- a/views/controls/menu/native_menu_gtk.cc
+++ b/views/controls/menu/native_menu_gtk.cc
@@ -221,8 +221,8 @@ void NativeMenuGtk::MenuPositionFunc(GtkMenu* menu,
}
void NativeMenuGtk::OnActivate(GtkMenuItem* menu_item) {
- int position = reinterpret_cast<int>(g_object_get_data(G_OBJECT(menu_item),
- "position"));
+ int position = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menu_item),
+ "position"));
if (model_->IsEnabledAt(position) &&
MenuTypeCanExecute(model_->GetTypeAt(position))) {
model_->ActivatedAt(position);