diff options
Diffstat (limited to 'WebCore/platform/chromium/PlatformKeyboardEventChromium.cpp')
| -rw-r--r-- | WebCore/platform/chromium/PlatformKeyboardEventChromium.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/WebCore/platform/chromium/PlatformKeyboardEventChromium.cpp b/WebCore/platform/chromium/PlatformKeyboardEventChromium.cpp index ae55afe..74643f7 100644 --- a/WebCore/platform/chromium/PlatformKeyboardEventChromium.cpp +++ b/WebCore/platform/chromium/PlatformKeyboardEventChromium.cpp @@ -27,9 +27,9 @@ #include "config.h" #include "PlatformKeyboardEvent.h" -#if PLATFORM(WIN_OS) +#if OS(WINDOWS) #include <windows.h> -#elif PLATFORM(DARWIN) +#elif OS(DARWIN) #import <Carbon/Carbon.h> #else #include "NotImplemented.h" @@ -39,7 +39,7 @@ namespace WebCore { void PlatformKeyboardEvent::disambiguateKeyDownEvent(Type type, bool backwardCompatibilityMode) { -#if PLATFORM(WIN_OS) +#if OS(WINDOWS) // No KeyDown events on Windows to disambiguate. ASSERT_NOT_REACHED(); #else @@ -56,7 +56,7 @@ void PlatformKeyboardEvent::disambiguateKeyDownEvent(Type type, bool backwardCom } else { m_keyIdentifier = String(); m_windowsVirtualKeyCode = 0; -#if PLATFORM(DARWIN) +#if OS(DARWIN) if (m_text.length() == 1 && (m_text[0U] >= 0xF700 && m_text[0U] <= 0xF7FF)) { // According to NSEvents.h, OpenStep reserves the range 0xF700-0xF8FF for function keys. However, some actual private use characters // happen to be in this range, e.g. the Apple logo (Option+Shift+K). @@ -71,10 +71,10 @@ void PlatformKeyboardEvent::disambiguateKeyDownEvent(Type type, bool backwardCom bool PlatformKeyboardEvent::currentCapsLockState() { -#if PLATFORM(WIN_OS) +#if OS(WINDOWS) // FIXME: Does this even work inside the sandbox? return GetKeyState(VK_CAPITAL) & 1; -#elif PLATFORM(DARWIN) +#elif OS(DARWIN) return GetCurrentKeyModifiers() & alphaLock; #else notImplemented(); |