[gnue] r8390 - trunk/gnue-forms/src/GFObjects

[johannes]

Author: johannes
Date: 2006-04-07 01:55:42 -0500 (Fri, 07 Apr 2006)
New Revision: 8390

Modified:
   trunk/gnue-forms/src/GFObjects/GFComponent.py
   trunk/gnue-forms/src/GFObjects/GFEntry.py
   trunk/gnue-forms/src/GFObjects/GFImage.py
   trunk/gnue-forms/src/GFObjects/GFLabel.py
Log:
Replace 'Char__width/height' attributes in phased init only, if they're 
not set already.


Modified: trunk/gnue-forms/src/GFObjects/GFComponent.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFComponent.py       2006-04-07 02:44:20 UTC 
(rev 8389)
+++ trunk/gnue-forms/src/GFObjects/GFComponent.py       2006-04-07 06:55:42 UTC 
(rev 8390)
@@ -46,7 +46,6 @@
 
         # Default attributes (these may be replaced by parser)
         self.type = "URL"
-        self.Char__height = int(gConfigForms('widgetHeight'))
 
 
     # -------------------------------------------------------------------------
@@ -77,6 +76,9 @@
     
         GFValue._phase_1_init_(self)
 
+        if not hasattr(self, 'Char__height'):
+            self.Char__height = int(gConfigForms('widgetHeight'))
+
         self._block = self.get_block()
         self._block._entryList.append(self)
 

Modified: trunk/gnue-forms/src/GFObjects/GFEntry.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFEntry.py   2006-04-07 02:44:20 UTC (rev 
8389)
+++ trunk/gnue-forms/src/GFObjects/GFEntry.py   2006-04-07 06:55:42 UTC (rev 
8390)
@@ -83,8 +83,10 @@
 
         GFTabStop._phase_1_init_(self)
 
-        self.Char__height = int(gConfigForms('widgetHeight'))
-        self.Char__width  = int(gConfigForms('widgetWidth'))
+        if not hasattr(self, 'Char__height'):
+            self.Char__height = int(gConfigForms('widgetHeight'))
+        if not hasattr(self, 'Char__width'):
+            self.Char__width  = int(gConfigForms('widgetWidth'))
 
         self._block = self.get_block()
         self._block._entryList.append(self)

Modified: trunk/gnue-forms/src/GFObjects/GFImage.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFImage.py   2006-04-07 02:44:20 UTC (rev 
8389)
+++ trunk/gnue-forms/src/GFObjects/GFImage.py   2006-04-07 06:55:42 UTC (rev 
8390)
@@ -44,7 +44,6 @@
 
         # Default attributes (these may be replaced by parser)
         self.type = "URL"
-        self.Char__height = int(gConfigForms('widgetHeight'))
 
 
     # -------------------------------------------------------------------------
@@ -64,6 +63,9 @@
 
         GFTabStop._phase_1_init_(self)
 
+        if not hasattr(self, 'Char__height'):
+            self.Char__height = int(gConfigForms('widgetHeight'))
+
         self._block = self.get_block()
         self._block._entryList.append(self)
 

Modified: trunk/gnue-forms/src/GFObjects/GFLabel.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFLabel.py   2006-04-07 02:44:20 UTC (rev 
8389)
+++ trunk/gnue-forms/src/GFObjects/GFLabel.py   2006-04-07 06:55:42 UTC (rev 
8390)
@@ -57,7 +57,8 @@
 
         GFObj._phase_1_init_(self)
 
-        self.Char__height = int(gConfigForms('widgetHeight'))
+        if not hasattr(self, 'Char__height'):
+            self.Char__height = int(gConfigForms('widgetHeight'))
 
         self._rows = getattr(self, 'rows', self._rows)
         self._gap  = getattr(self, 'rowSpacer', self._gap)