gnue/gnuef/src/GFObjects GFEntry.py

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Branch:         gnuef-new-datasources
Changes by:     Jason Cater <address@hidden>    01/07/31 18:34:42

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

Log message:
        Fixed problem w/cvs merge

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFObjects/GFEntry.py.diff?cvsroot=OldCVS&only_with_tag=gnuef-new-datasources&tr1=1.2.2.15&tr2=1.2.2.16&r1=text&r2=text

Patches:
Index: gnue/gnuef/src/GFObjects/GFEntry.py
diff -u gnue/gnuef/src/GFObjects/GFEntry.py:1.6 
gnue/gnuef/src/GFObjects/GFEntry.py:1.7
--- gnue/gnuef/src/GFObjects/GFEntry.py:1.6     Wed Jul 18 15:45:01 2001
+++ gnue/gnuef/src/GFObjects/GFEntry.py Tue Jul 31 16:22:30 2001
@@ -53,15 +53,18 @@
     self._uppercase = 0
     self._lowercase = 0
     self._numeric = 0
+    self._rows = 1
     self.typecast="text"
     self.case="mixed"
 
 
   def buildObject(self): 
+
     # Convert deprecated attributes
     if hasattr(self,'numeric') and self.numeric: 
       del self.numeric
       self.typecast = 'number'
+
     if hasattr(self,'uppercase') and self.uppercase: 
       del self.uppercase
       self.case = 'upper' 
@@ -69,6 +72,11 @@
       del self.lowercase
       self.case = 'lower' 
 
+    if not hasattr(self, 'rows') and hasattr(self,'visibleCount'): 
+      self.rows = self.visibleCount
+      del self.visibleCount
+
+
 
   def initialize(self):
 
@@ -91,12 +99,11 @@
       datasourceName,self.fieldName = string.split(self.foreign_key,'.')
       self.datasource = self._block._form._datasourceDictionary[datasourceName]
 
-    #if not hasattr(self,'visibleCount'):
     if not hasattr(self,'rows'):
       if hasattr(self._block,'rows'):
-        self.visibleCount = self._block.rows
+        self._rows = self._block.rows
     else:
-      self.visibleCount = self.rows
+      self._rows = self.rows
       
     if not hasattr(self,'rowSpacer'):
       if hasattr(self._block,'rowSpacer'):