[jToolkit-cvs] jToolkit/widgets widgets.py,1.11,1.12

[<dav...@us...>]

Update of /cvsroot/jtoolkit/jToolkit/widgets
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19690

Modified Files:
	widgets.py 
Log Message:
widgets.Page 'script' argument can now accept a widgets.Script widget or a string



Index: widgets.py
===================================================================
RCS file: /cvsroot/jtoolkit/jToolkit/widgets/widgets.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** widgets.py	9 Feb 2004 14:22:41 -0000	1.11
--- widgets.py	9 Feb 2004 14:42:30 -0000	1.12
***************
*** 223,227 ****
    def __init__(self, title="", contents=[], newattribs={}, script=""):
      self.title = title
!     self.script = script
      ContentWidget.__init__(self, None, contents, newattribs)
  
--- 223,227 ----
    def __init__(self, title="", contents=[], newattribs={}, script=""):
      self.title = title
!     self.script = PlainContents(script)
      ContentWidget.__init__(self, None, contents, newattribs)
  
***************
*** 268,272 ****
        <BASE href="%s" target="%s">""" % (base, target)
      # any script required
!     result += self.script
      # finished the head
      result += """
--- 268,272 ----
        <BASE href="%s" target="%s">""" % (base, target)
      # any script required
!     result += self.script.gethtml()
      # finished the head
      result += """