# HG changeset patch # User KarstenBock@gmx.net # Date 1317805051 -7200 # Node ID 5756e615b029edd0c559ae2d9a4740df95ada698 # Parent 3aff9dee1b4fd03b828c5a7da06765a0be576cd2 If gui_file, in the ContainerGUIBase constructor, is a widget self.gui will now be set to it. diff -r 3aff9dee1b4f -r 5756e615b029 src/parpg/gui/containergui_base.py --- a/src/parpg/gui/containergui_base.py Wed Oct 05 10:54:56 2011 +0200 +++ b/src/parpg/gui/containergui_base.py Wed Oct 05 10:57:31 2011 +0200 @@ -28,7 +28,9 @@ def __init__(self, controller, gui_file): self.controller = controller - if isinstance(gui_file, StringTypes): + if isinstance(gui_file, pychan.Widget): + self.gui = gui_file + elif isinstance(gui_file, StringTypes): xml_file = vfs.VFS.open(gui_file) self.gui = pychan.loadXML(xml_file) else: