*** empty log message ***

direct/src/gui/DirectFrame.py

@@ -115,6 +115,8 @@ class DirectFrame(DirectGuiWidget):
         if arg == None:
             # Passed in None
             imageList = (None,) * self['numStates']
+        elif isinstance(arg, NodePath):
+            imageList = (arg,) * self['numStates']
         elif type(arg) == types.StringType:
             # Passed in a single node path, make a tuple out of it
             imageList = (arg,) * self['numStates']
@@ -124,7 +126,7 @@ class DirectFrame(DirectGuiWidget):
                 (type(arg[0]) == types.StringType) and
                 (type(arg[1]) == types.StringType)):
                 # Its a model/node pair of strings
-                image = (arg,) * self['numStates']
+                imageList = (arg,) * self['numStates']
             else:
                 # Assume its a list of node paths
                 imageList = arg

direct/src/gui/DirectGuiBase.py

@@ -669,6 +669,7 @@ class DirectGuiWidget(DirectGuiBase, NodePath):
             # Initial pos/scale of the widget
             ('pos',            None,         INITOPT),
             ('scale',          None,         INITOPT),
+            ('color',          None,         INITOPT),
             )
         # Merge keyword options with default options
         self.defineoptions(kw, optiondefs)
@@ -700,7 +701,14 @@ class DirectGuiWidget(DirectGuiBase, NodePath):
                 (type(scale) == types.FloatType)):
                 self.setScale(scale)
             else:
-                apply(self.setScale, self['scale'])
+                apply(self.setScale, scale)
+        if self['color']:
+            color = self['color']
+            # Can either be a Vec4 or a tuple of 4 values
+            if (isinstance(color, Vec4)):
+                self.setColor(color)
+            else:
+                apply(self.setColor, color)
         # Initialize names
         self.setName(self.guiId)
         # Create