fixes #5659

svn changeset:15134/svn branch:6.4

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java b/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java
index ff754d2cf9a8098ef2a58129a7c8bc7ddab97d39..b2f40f4d200ef6719b0b3373e7c167674a140e75 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java
@@ -1390,7 +1390,7 @@ public class VCalendarPanel extends FocusableFlexTable implements
             // Update times\r
             updateTimes();\r
 \r
-            ListBox lastDropDown = (ListBox) getWidget(getWidgetCount() - 1);\r
+            ListBox lastDropDown = getLastDropDown();\r
             lastDropDown.addKeyDownHandler(new KeyDownHandler() {\r
                 public void onKeyDown(KeyDownEvent event) {\r
                     boolean shiftKey = event.getNativeEvent().getShiftKey();\r
@@ -1407,6 +1407,18 @@ public class VCalendarPanel extends FocusableFlexTable implements
 \r
         }\r
 \r
+        private ListBox getLastDropDown() {\r
+            int i = getWidgetCount() - 1;\r
+            while (i >= 0) {\r
+                Widget widget = getWidget(i);\r
+                if (widget instanceof ListBox) {\r
+                    return (ListBox) widget;\r
+                }\r
+                i--;\r
+            }\r
+            return null;\r
+        }\r
+\r
         /**\r
          * Updates the valus to correspond to the values in value\r
          */\r