gistfile1.txt

diff --git a/library/pyjamas/django/Form.py b/library/pyjamas/django/Form.py
index 240015c..0c6723d 100644
--- a/library/pyjamas/django/Form.py
+++ b/library/pyjamas/django/Form.py
@@ -9,8 +9,10 @@ from pyjamas.ui.Grid import Grid
 from pyjamas.ui.FormPanel import FormPanel
 #from pyjamas.ui.Composite import Composite
 from pyjamas.log import writebr
+import pdb
 
 from pyjamas.ui.TextBox import TextBox
+from pyjamas.ui.ListBox import ListBox
 
 class CharField(TextBox):
     def __init__(self, **kwargs):
@@ -63,9 +65,17 @@ class FloatField(TextBox):
     def getValue(self):
         return self.getText()
 
+class ChoiceField(ListBox):
+    def __init__(self, **kwargs):
+        ListBox.__init__(self)
+        self.choices = kwargs.pop('choices', []) # list of tuples (val, text)
+        for v, t in self.choices:
+            self.addItem(t, str(v))
+
 widget_factory = {'CharField': CharField,
                   'IntegerField': IntegerField,
-                  'FloatField': FloatField
+                  'FloatField': FloatField,
+                  'ChoiceField': ChoiceField
                  }
 
 class FormSaveGrid: