diff options
| author | Feng Qian <fqian@google.com> | 2009-06-17 12:12:20 -0700 |
|---|---|---|
| committer | Feng Qian <fqian@google.com> | 2009-06-17 12:12:20 -0700 |
| commit | 5f1ab04193ad0130ca8204aadaceae083aca9881 (patch) | |
| tree | 5a92cd389e2cfe7fb67197ce14b38469462379f8 /WebCore/platform/gtk/KeyEventGtk.cpp | |
| parent | 194315e5a908cc8ed67d597010544803eef1ac59 (diff) | |
| download | external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.zip external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.tar.gz external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.tar.bz2 | |
Get WebKit r44544.
Diffstat (limited to 'WebCore/platform/gtk/KeyEventGtk.cpp')
| -rw-r--r-- | WebCore/platform/gtk/KeyEventGtk.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/WebCore/platform/gtk/KeyEventGtk.cpp b/WebCore/platform/gtk/KeyEventGtk.cpp index e0742f4..5875547 100644 --- a/WebCore/platform/gtk/KeyEventGtk.cpp +++ b/WebCore/platform/gtk/KeyEventGtk.cpp @@ -37,9 +37,6 @@ #include <gdk/gdk.h> #include <gdk/gdkkeysyms.h> -// GTK_CHECK_VERSION is defined in gtk/gtkversion.h -#include <gtk/gtk.h> - namespace WebCore { // FIXME: This is incomplete. We should change this to mirror @@ -260,9 +257,10 @@ static int windowsKeyCodeForKeyEvent(unsigned int keycode) case GDK_Help: return VK_HELP; // (2F) HELP key case GDK_0: - case GDK_parenleft: + case GDK_parenright: return VK_0; // (30) 0) key case GDK_1: + case GDK_exclam: return VK_1; // (31) 1 ! key case GDK_2: case GDK_at: @@ -286,7 +284,7 @@ static int windowsKeyCodeForKeyEvent(unsigned int keycode) case GDK_asterisk: return VK_8; // (38) 8 key '*' case GDK_9: - case GDK_parenright: + case GDK_parenleft: return VK_9; // (39) 9 key '(' case GDK_a: case GDK_A: @@ -536,12 +534,7 @@ PlatformKeyboardEvent::PlatformKeyboardEvent(GdkEventKey* event) , m_shiftKey((event->state & GDK_SHIFT_MASK) || (event->keyval == GDK_3270_BackTab)) , m_ctrlKey(event->state & GDK_CONTROL_MASK) , m_altKey(event->state & GDK_MOD1_MASK) -#if GTK_CHECK_VERSION(2,10,0) , m_metaKey(event->state & GDK_META_MASK) -#else - // GDK_MOD2_MASK doesn't always mean meta so we can't use it - , m_metaKey(false) -#endif , m_gdkEventKey(event) { } |