gnue/gnuef/src GFObjects.py UIwxpython.py

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 01/02/16 16:42:26

Modified files:
        gnuef/src      : GFObjects.py UIwxpython.py 

Log message:
        Fixed gap bugs in entry and labels
        An empty entry is now considered valid on validated entries

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFObjects.py.diff?r1=1.62&r2=1.63
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/UIwxpython.py.diff?r1=1.66&r2=1.67

Patches:
Index: gnue/gnuef/src/GFObjects.py
diff -u gnue/gnuef/src/GFObjects.py:1.62 gnue/gnuef/src/GFObjects.py:1.63
--- gnue/gnuef/src/GFObjects.py:1.62    Thu Feb 15 20:34:11 2001
+++ gnue/gnuef/src/GFObjects.py Fri Feb 16 16:42:26 2001
@@ -342,15 +342,19 @@
   #
   def verifyValue(self):
     value = 1
-    if hasattr(self,'foreign_key'):
-      value = 0
-      datasourceName,fieldName = string.split(self.foreign_key,'.')
-      datasource = self.block.form.datasourceDictionary[datasourceName]
 
-      for count in range(datasource.getLastRecordNumber()+1):
-        if datasource.getField(count,fieldName) == self.value:
-          value = 1
-          break        
+    # If empty skip test
+    if len(self.value) != 0:
+
+      if hasattr(self,'foreign_key'):
+        value = 0
+        datasourceName,fieldName = string.split(self.foreign_key,'.')
+        datasource = self.block.form.datasourceDictionary[datasourceName]
+
+        for count in range(datasource.getLastRecordNumber()+1):
+          if datasource.getField(count,fieldName) == self.value:
+            value = 1
+            break        
     return value
 
   #
Index: gnue/gnuef/src/UIwxpython.py
diff -u gnue/gnuef/src/UIwxpython.py:1.66 gnue/gnuef/src/UIwxpython.py:1.67
--- gnue/gnuef/src/UIwxpython.py:1.66   Thu Feb 15 20:34:11 2001
+++ gnue/gnuef/src/UIwxpython.py        Fri Feb 16 16:42:26 2001
@@ -456,6 +456,11 @@
       if not hasattr(object,'visibleCount'):
         object.visibleCount = 1
       
+      if hasattr(object,'gap'):
+        gap = int(object.gap)
+      else:
+        gap = 0
+
       count = int(object.visibleCount)
 
       style = wxALIGN_LEFT|wxST_NO_AUTORESIZE
@@ -477,7 +482,7 @@
         spacer = int(spacer)        
         newWidget = wxStaticText(container, -1, str(object.text),
                                  wxPoint(int(object.x)*int(self.widgetWidth),
-                                         
(int(object.y)+spacer)*int(self.widgetHeight)),
+                                         
(int(object.y)+spacer+(spacer*gap))*int(self.widgetHeight)),
                                  size, style)
         
         #eval(self.widgetConstructor[object.getObjectType()])
@@ -722,7 +727,7 @@
 
           newWidget = wxComboBox(container, -1, "",
                                  wxPoint(int(object.x)*int(self.widgetWidth),
-                                         
(int(object.y)+spacer)*int(self.widgetHeight)),
+                                         
(int(object.y)+spacer+(gap*spacer))*int(self.widgetHeight)),
                                  wxSize(int(object.width)*int(self.textWidth),
                                         
int(object.height)*int(self.textHeight)),
                                  choices, wxCB_DROPDOWN)