summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpiman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-29 23:13:27 +0000
committerpiman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-29 23:13:27 +0000
commit261baf9696bd0c28c6466de3d4921bef4ba937c5 (patch)
treebb22fc43a737e471a3335fdd223b78c0d9bb8d4c
parentaf892b45dc366dd19c98f2bd030ed87b9152468c (diff)
downloadchromium_src-261baf9696bd0c28c6466de3d4921bef4ba937c5.zip
chromium_src-261baf9696bd0c28c6466de3d4921bef4ba937c5.tar.gz
chromium_src-261baf9696bd0c28c6466de3d4921bef4ba937c5.tar.bz2
linux: fix build. don't use GDK_META_MASK until we figure out which version of GTK to check for
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19547 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--o3d/plugin/linux/main_linux.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/o3d/plugin/linux/main_linux.cc b/o3d/plugin/linux/main_linux.cc
index 0841d59..d381ae0 100644
--- a/o3d/plugin/linux/main_linux.cc
+++ b/o3d/plugin/linux/main_linux.cc
@@ -384,9 +384,14 @@ static int GetGtkModifierState(int gtk_state) {
if (gtk_state & GDK_MOD1_MASK) {
modifier_state |= Event::MODIFIER_ALT;
}
+#if 0
+ // TODO: This code is temporarily disabled until we figure out which exact
+ // version of GTK to test for: GDK_META_MASK doesn't exist in older (e.g. 2.8)
+ // versions.
if (gtk_state & GDK_META_MASK) {
modifier_state |= Event::MODIFIER_META;
}
+#endif
return modifier_state;
}