Merge remote branch 'origin/master' into layoutperformance

Conflicts:
	src/com/vaadin/terminal/gwt/client/ui/label/VLabel.java

2 files changed, 11 insertions, 0 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ui/label/VLabel.java b/src/com/vaadin/terminal/gwt/client/ui/label/VLabel.java
index 357711d2f4..dd2a2d3e93 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/label/VLabel.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/label/VLabel.java
@@ -7,6 +7,7 @@ package com.vaadin.terminal.gwt.client.ui.label;
 import com.google.gwt.dom.client.Style.Display;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.HTML;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.BrowserInfo;
 import com.vaadin.terminal.gwt.client.Util;
 import com.vaadin.terminal.gwt.client.VTooltip;
@@ -15,6 +16,8 @@ public class VLabel extends HTML {
 
     public static final String CLASSNAME = "v-label";
     private static final String CLASSNAME_UNDEFINED_WIDTH = "v-label-undef-w";
+    
+    private ApplicationConnection connection;
 
     public VLabel() {
         super();
@@ -36,6 +39,9 @@ public class VLabel extends HTML {
             event.stopPropagation();
             return;
         }
+        if (connection != null) {
+            connection.handleWidgetTooltipEvent(event, this);
+        }
     }
 
     @Override
@@ -60,4 +66,8 @@ public class VLabel extends HTML {
             super.setText(text);
         }
     }
+
+    void setConnection(ApplicationConnection client) {
+        connection = client;
+    }
 }
diff --git a/src/com/vaadin/terminal/gwt/client/ui/label/VLabelPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/label/VLabelPaintable.java
index b61eb3eaba..5f9679d3cf 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/label/VLabelPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/label/VLabelPaintable.java
@@ -19,6 +19,7 @@ public class VLabelPaintable extends VAbstractPaintableWidget {
     @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
         super.updateFromUIDL(uidl, client);
+        getWidgetForPaintable().setConnection(client);
         if (!isRealUpdate(uidl)) {
             return;
         }