Merges from 6.0 branch.

svn changeset:7577/svn branch:theme_2009_03

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java
index 2f604a992785fce3b3ea25b471a17dba37daf6ef..35e6adf71e10f1bec441f4dea434b78d82bcec6b 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java
@@ -1067,6 +1067,9 @@ public class IScrollTable extends FlowPanel implements Table, ScrollListener {
                 DOM.setStyleAttribute(captionContainer, "width", "");
                 setWidth("");
             } else {
+
+                ApplicationConnection.getConsole().log("DEB2 " + w + " ");
+
                 captionContainer.getStyle().setPropertyPx("width", w);
 
                 /*
@@ -1951,8 +1954,10 @@ public class IScrollTable extends FlowPanel implements Table, ScrollListener {
             final int cells = DOM.getChildCount(row.getElement());
             for (int i = 0; i < cells; i++) {
                 final Element cell = DOM.getChild(row.getElement(), i);
-                final int w = IScrollTable.this
-                        .getColWidth(getColKeyByIndex(i));
+                int w = IScrollTable.this.getColWidth(getColKeyByIndex(i));
+                if (w < 0) {
+                    w = 0;
+                }
                 cell.getFirstChildElement().getStyle()
                         .setPropertyPx("width", w);
                 cell.getStyle().setPropertyPx("width", w);