Modified VButton to be more easily extendable.

svn changeset:10099/svn branch:6.2

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VButton.java b/src/com/vaadin/terminal/gwt/client/ui/VButton.java
index d50e7daae06d71ebb9feb57d895fdb1065a722f0..1dc2da9b5958f99381f7614e6b3e94d45813b19c 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VButton.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VButton.java
@@ -42,7 +42,7 @@ public class VButton extends FocusWidget implements Paintable, ClickHandler {
      * mouse while clicking it. In this case mouse leaves the button without
      * moving.
      */
-    private boolean clickPending;
+    protected boolean clickPending;
 
     private boolean enabled = true;
 
@@ -81,9 +81,9 @@ public class VButton extends FocusWidget implements Paintable, ClickHandler {
         // Add a11y role "button"
         Accessibility.setRole(getElement(), Accessibility.ROLE_BUTTON);
 
-        wrapper.setClassName(CLASSNAME + "-wrap");
+        wrapper.setClassName(getStylePrimaryName() + "-wrap");
         getElement().appendChild(wrapper);
-        captionElement.setClassName(CLASSNAME + "-caption");
+        captionElement.setClassName(getStylePrimaryName() + "-caption");
         wrapper.appendChild(captionElement);
 
         addClickHandler(this);