diff options
| author | Artur Signell <artur@vaadin.com> | 2012-02-06 08:58:11 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-02-06 08:58:31 +0200 |
| commit | 68152911bf59e09b60b659dacf67549de038f37a (patch) | |
| tree | ac4c14c84d897b5fb064466e35001478b40f72f9 /src/com/vaadin | |
| parent | 8d5920ba2f7ec0a5753614a7137bb792df38d489 (diff) | |
| download | vaadin-framework-68152911bf59e09b60b659dacf67549de038f37a.tar.gz vaadin-framework-68152911bf59e09b60b659dacf67549de038f37a.zip | |
Fixed compilation errors introduced by merge from 6.8
Diffstat (limited to 'src/com/vaadin')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java | 2 | ||||
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java index 5305bf6a23..b54c3dd943 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java @@ -1422,7 +1422,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, // request immediately; otherwise queue in the same burst as the // focus event. Fixes #8321. boolean immediate = focused - || !client.hasEventListeners(this, EventId.FOCUS); + || !client.hasWidgetEventListeners(this, EventId.FOCUS); filterOptions(-1, "", immediate); popupOpenerClicked = true; lastFilter = ""; diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java index e653e1e7b4..b84fc1312f 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java @@ -2270,8 +2270,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, handleCaptionEvent(event); boolean stopPropagation = true; if (event.getTypeInt() == Event.ONCONTEXTMENU - && !client.hasEventListeners(VScrollTable.this, - HEADER_CLICK_EVENT_ID)) { + && !client.hasWidgetEventListeners( + VScrollTable.this, HEADER_CLICK_EVENT_ID)) { // Prevent showing the browser's context menu only when // there is a header click listener. stopPropagation = false; @@ -3346,7 +3346,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, } boolean stopPropagation = true; if (event.getTypeInt() == Event.ONCONTEXTMENU - && !client.hasEventListeners(VScrollTable.this, + && !client.hasWidgetEventListeners(VScrollTable.this, FOOTER_CLICK_EVENT_ID)) { // Show browser context menu if a footer click listener is // not present |