Changeset 5970

Timestamp:

09/01/10 05:11:56 (1 year ago)

Author:

ed

Message:

Moved the recent additions of field validation flags from dForm to dFormMixin.

Files:

• trunk/dabo/ui/uiwx/dForm.py (modified) (1 diff)
• trunk/dabo/ui/uiwx/dFormMixin.py (modified) (2 diffs)

trunk/dabo/ui/uiwx/dForm.py

@@ -56 +56 @@
-        # Holds the dataSource passed to the method
-        self.dataSourceParameter = None
-        # Flag to prevent infinite loops when doing field-level validation
-        self._fieldValidationControl = None
-
-

trunk/dabo/ui/uiwx/dFormMixin.py

@@ -69 +69 @@
-        self._defaultHeight = 500
-        self._defaultState = "Normal"
+        # Flag to prevent infinite loops when doing field-level validation
+        self._fieldValidationControl = None
-
-        super(dFormMixin, self).__init__(preClass, parent, properties, 
@@ -164 +166 @@
-            self.raiseEvent(dEvents.Deactivate, evt)
-        evt.Skip()
+
+
+    def _controlGotFocus(self, ctrl):
+        if self._fieldValidationControl is ctrl:
+            # Clear it
+            self._fieldValidationControl = None
-            
-