1 files changed, 20 insertions, 0 deletions
diff --git a/src/com/itmill/toolkit/ui/ComboBox.java b/src/com/itmill/toolkit/ui/ComboBox.java
index 0125af1d0f..915ad94827 100644
--- a/src/com/itmill/toolkit/ui/ComboBox.java
+++ b/src/com/itmill/toolkit/ui/ComboBox.java
@@ -17,6 +17,9 @@ import com.itmill.toolkit.data.Container;
  * 
  */
 public class ComboBox extends Select {
+
+    private String emptyText = null;
+
     public ComboBox() {
         setMultiSelect(false);
         setNewItemsAllowed(false);
@@ -47,4 +50,21 @@ public class ComboBox extends Select {
         super.setMultiSelect(multiSelect);
     }
 
+    /*- TODO enable and test this - client impl exists
+    public String getEmptyText() {
+        return emptyText;
+    }
+
+    public void setEmptyText(String emptyText) {
+        this.emptyText = emptyText;
+    }
+
+    public void paintContent(PaintTarget target) throws PaintException {
+        if (emptyText != null) {
+            target.addAttribute("emptytext", emptyText);
+        }
+        super.paintContent(target);
+    }
+    -*/
+
 }