replaced hard coded style with a css rule

svn changeset:15308/svn branch:6.4

2 files changed, 4 insertions, 14 deletions

diff --git a/WebContent/VAADIN/themes/base/button/button.css b/WebContent/VAADIN/themes/base/button/button.css
index 29dfab0de7..5051360bb3 100644
--- a/WebContent/VAADIN/themes/base/button/button.css
+++ b/WebContent/VAADIN/themes/base/button/button.css
@@ -130,6 +130,10 @@
 /*

  * Checkbox styles

  * -------------------------------------- */

+ 

+ .v-checkbox {

+ 	display: block;

+ }

 

 .v-checkbox,

 .v-checkbox label,

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VCheckBox.java b/src/com/vaadin/terminal/gwt/client/ui/VCheckBox.java
index 08111452f7..469fbf20ae 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VCheckBox.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VCheckBox.java
@@ -42,8 +42,6 @@ public class VCheckBox extends com.google.gwt.user.client.ui.CheckBox implements
 
     private Icon icon;
 
-    private boolean isBlockMode = false;
-
     private HandlerRegistration focusHandlerRegistration;
     private HandlerRegistration blurHandlerRegistration;
 
@@ -170,26 +168,14 @@ public class VCheckBox extends com.google.gwt.user.client.ui.CheckBox implements
 
     @Override
     public void setWidth(String width) {
-        setBlockMode();
         super.setWidth(width);
     }
 
     @Override
     public void setHeight(String height) {
-        setBlockMode();
         super.setHeight(height);
     }
 
-    /**
-     * makes container element (span) to be block element to enable sizing.
-     */
-    private void setBlockMode() {
-        if (!isBlockMode) {
-            DOM.setStyleAttribute(getElement(), "display", "block");
-            isBlockMode = true;
-        }
-    }
-
     public void onFocus(FocusEvent arg0) {
         client.updateVariable(id, EventId.FOCUS, "", true);
     }