From f3bdf0fa7c8cbbf1a0fb1449850c776c3fc10168 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Leif=20=C3=85strand?= <leif@vaadin.com>
Date: Tue, 31 Jan 2012 13:03:58 +0200
Subject: [PATCH] Fix an invalid cast from Widget to VPaintableWidget (#8324)

---
 .../vaadin/terminal/gwt/client/ui/VMeasuringOrderedLayout.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VMeasuringOrderedLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VMeasuringOrderedLayout.java
index 817cf9bfe0..5c5f67bf18 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VMeasuringOrderedLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VMeasuringOrderedLayout.java
@@ -117,7 +117,8 @@ public class VMeasuringOrderedLayout extends ComplexPanel implements Container,
             // Remove the wrapper
             getElement().removeChild(wrapper);
 
-            client.unregisterPaintable((VPaintableWidget) widget);
+            client.unregisterPaintable(VPaintableMap.get(client).getPaintable(
+                    widget));
         }
 
         int bitMask = uidl.getIntAttribute("margins");
-- 
2.39.5