flowables.py: ensure _frame is removed and add availableWidth to container drawon call py33
authorrobin
Wed, 12 Feb 2014 15:55:13 +0000
branchpy33
changeset 4033 480bd0313eb0
parent 4032 5106a9463326
child 4034 d86823da2af8
flowables.py: ensure _frame is removed and add availableWidth to container drawon call
src/reportlab/platypus/flowables.py
--- a/src/reportlab/platypus/flowables.py	Wed Feb 12 12:27:48 2014 +0000
+++ b/src/reportlab/platypus/flowables.py	Wed Feb 12 15:55:13 2014 +0000
@@ -883,6 +883,7 @@
             c.drawOn(canv,x,y,_sW=aW-w)
             if c is not content[-1] and not getattr(c,'_SPACETRANSFER',None):
                 y -= pS
+            del c._frame
 
     def copyContent(self,content=None):
         C = [].append
@@ -1244,7 +1245,8 @@
         if self._C0:
             _Container.drawOn(self, canv, Fx, y, content=self._C0, aW=self._iW)
         if self._C1:
-            _Container.drawOn(self, canv, x, y-self._aH,content=self._C1)
+            aW, aH = self._wrapArgs
+            _Container.drawOn(self, canv, x, y-self._aH,content=self._C1, aW=aW)
 
     def _findSplit(self,canv,availWidth,availHeight,mergeSpace=1,obj=None):
         '''return max width, required height for a list of flowables F'''