diff options
author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-22 19:33:13 +0000 |
---|---|---|
committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-22 19:33:13 +0000 |
commit | 3d13c830adf25a9884e5f1e5c0ee4ceae0d40d66 (patch) | |
tree | ac1cf1f31f3648529591c744c6e4189271201551 /webkit/port/platform/chromium/PopupMenuChromium.cpp | |
parent | 2a95361fe987395915a49a6213c739ab6ba34d48 (diff) | |
download | chromium_src-3d13c830adf25a9884e5f1e5c0ee4ceae0d40d66.zip chromium_src-3d13c830adf25a9884e5f1e5c0ee4ceae0d40d66.tar.gz chromium_src-3d13c830adf25a9884e5f1e5c0ee4ceae0d40d66.tar.bz2 |
Get PopupMenuChromium building under Linux
Review URL: http://codereview.chromium.org/7875
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3750 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/port/platform/chromium/PopupMenuChromium.cpp')
-rw-r--r-- | webkit/port/platform/chromium/PopupMenuChromium.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/webkit/port/platform/chromium/PopupMenuChromium.cpp b/webkit/port/platform/chromium/PopupMenuChromium.cpp index 31a07b7..75ea7a9 100644 --- a/webkit/port/platform/chromium/PopupMenuChromium.cpp +++ b/webkit/port/platform/chromium/PopupMenuChromium.cpp @@ -41,11 +41,12 @@ #include "FramelessScrollView.h" #include "GraphicsContext.h" #include "IntRect.h" +#include "NotImplemented.h" #include "Page.h" #include "PlatformKeyboardEvent.h" #include "PlatformMouseEvent.h" #include "PlatformScreen.h" -#include "PlatformScrollbar.h" +#include "PlatformScrollBar.h" #include "PlatformWheelEvent.h" #include "SystemTime.h" #include "RenderBlock.h" @@ -182,11 +183,11 @@ private: PopupListBox(PopupMenuClient* client) : m_originalIndex(0) , m_selectedIndex(0) + , m_acceptOnAbandon(false) , m_visibleRows(0) , m_popupClient(client) , m_repeatingChar(0) , m_lastCharTime(0) - , m_acceptOnAbandon(false) { setScrollbarsMode(ScrollbarAlwaysOff); } @@ -543,11 +544,10 @@ bool PopupListBox::handleKeyEvent(const PlatformKeyboardEvent& event) if (event.type() == PlatformKeyboardEvent::KeyUp) return true; +#if defined(OS_WIN) if (numItems() == 0 && event.windowsVirtualKeyCode() != VK_ESCAPE) return true; - int oldIndex = m_selectedIndex; - switch (event.windowsVirtualKeyCode()) { case VK_ESCAPE: abandon(); // may delete this @@ -580,6 +580,9 @@ bool PopupListBox::handleKeyEvent(const PlatformKeyboardEvent& event) } break; } +#else + notImplemented(); +#endif if (m_originalIndex != m_selectedIndex) { // Keyboard events should update the selection immediately (but we don't |