From 9605248a8a6ef19bc21102a235e0bd90f1f46690 Mon Sep 17 00:00:00 2001
From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Tue, 12 Oct 2010 13:07:43 +0000
Subject: [PATCH] fixes #5778

svn changeset:15519/svn branch:6.5
---
 src/com/vaadin/terminal/gwt/client/ui/VCssLayout.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VCssLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VCssLayout.java
index 4813dbcd21..e0a74735b7 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VCssLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VCssLayout.java
@@ -170,6 +170,11 @@ public class VCssLayout extends SimplePanel implements Paintable, Container {
                 final Paintable child = client.getPaintable(r);
                 if (oldWidgets.contains(child)) {
                     oldWidgets.remove(child);
+                    VCaption vCaption = widgetToCaption.get(child);
+                    if (vCaption != null) {
+                        add(vCaption);
+                        oldWidgets.remove(vCaption);
+                    }
                 }
 
                 add((Widget) child);
-- 
2.39.5