aboutsummaryrefslogtreecommitdiffstats
path: root/src/com/vaadin/ui/Button.java
diff options
context:
space:
mode:
authorHenri Sara <hesara@vaadin.com>2012-01-27 18:38:13 +0200
committerHenri Sara <hesara@vaadin.com>2012-01-27 18:38:13 +0200
commit91b3084e060f975ee35573972ace8bcf8fe3a5ed (patch)
tree154bb05f457b91388454fe42cd7652ca0d05c688 /src/com/vaadin/ui/Button.java
parent06ef07c7fd6eab0b7446367fa5a43384ae469cef (diff)
downloadvaadin-framework-91b3084e060f975ee35573972ace8bcf8fe3a5ed.tar.gz
vaadin-framework-91b3084e060f975ee35573972ace8bcf8fe3a5ed.zip
Merge changes from master to rpc branch.
Diffstat (limited to 'src/com/vaadin/ui/Button.java')
-rw-r--r--src/com/vaadin/ui/Button.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/vaadin/ui/Button.java b/src/com/vaadin/ui/Button.java
index 7c0811008a..9910f3a4c4 100644
--- a/src/com/vaadin/ui/Button.java
+++ b/src/com/vaadin/ui/Button.java
@@ -24,6 +24,7 @@ import com.vaadin.terminal.PaintTarget;
import com.vaadin.terminal.gwt.client.MouseEventDetails;
import com.vaadin.terminal.gwt.client.ui.VButton;
import com.vaadin.terminal.gwt.client.ui.VButton.ButtonClientToServerRpc;
+import com.vaadin.terminal.gwt.client.ui.VButtonPaintable;
import com.vaadin.terminal.gwt.server.RpcTarget;
import com.vaadin.tools.ReflectTools;
import com.vaadin.ui.ClientWidget.LoadStyle;
@@ -38,7 +39,7 @@ import com.vaadin.ui.Component.Focusable;
* @since 3.0
*/
@SuppressWarnings("serial")
-@ClientWidget(value = VButton.class, loadStyle = LoadStyle.EAGER)
+@ClientWidget(value = VButtonPaintable.class, loadStyle = LoadStyle.EAGER)
public class Button extends AbstractComponent implements
FieldEvents.BlurNotifier, FieldEvents.FocusNotifier, Focusable,
Action.ShortcutNotifier, RpcTarget {