From 479683ba68d0b179105afd7e1f1d97b17730f7d3 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sun, 26 Feb 2006 16:40:43 +0000
Subject: Fixed a bug in rendering script files.

---
 framework/Web/UI/WebControls/THead.php   | 7 +++++--
 framework/Web/UI/WebControls/TWizard.php | 6 +++---
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'framework/Web/UI/WebControls')

diff --git a/framework/Web/UI/WebControls/THead.php b/framework/Web/UI/WebControls/THead.php
index 48f436a3..ee2effeb 100644
--- a/framework/Web/UI/WebControls/THead.php
+++ b/framework/Web/UI/WebControls/THead.php
@@ -130,8 +130,11 @@ class THead extends TControl
 		$cs=$page->getClientScript();
 		$cs->renderStyleSheetFiles($writer);
 		$cs->renderStyleSheets($writer);
-		$cs->renderHeadScriptFiles($writer);
-		$cs->renderHeadScripts($writer);
+		if($page->getClientSupportsJavaScript())
+		{
+			$cs->renderHeadScriptFiles($writer);
+			$cs->renderHeadScripts($writer);
+		}
 		parent::render($writer);
 		$writer->write("</head>\n");
 	}
diff --git a/framework/Web/UI/WebControls/TWizard.php b/framework/Web/UI/WebControls/TWizard.php
index a8ed806f..eaf82e07 100644
--- a/framework/Web/UI/WebControls/TWizard.php
+++ b/framework/Web/UI/WebControls/TWizard.php
@@ -101,7 +101,7 @@
  * @version v1.0, last update on Sat Dec 11 15:25:11 EST 2004
  * @package System.Web.UI.WebControls
  */
-class TWizard extends TPanel implements INamingContainer
+class TWizard extends TWebControl implements INamingContainer
 {
 	/**
 	 * The command name for the OnNextCommand.
@@ -261,7 +261,7 @@ class TWizard extends TPanel implements INamingContainer
 	 */
 	public function setActiveStepIndex($index)
 	{
-		$this->setViewState('ActiveStepIndex',$index,0);
+		$this->setViewState('ActiveStepIndex',TPropertyValue::ensureInteger($index),0);
 	}
 
 	/**
@@ -281,7 +281,7 @@ class TWizard extends TPanel implements INamingContainer
 	 * is the TWizard.
 	 * @param object a component object.
 	 */
-	public function addParsedObject($object,$context)
+	public function addParsedObject($object)
 	{
 		if($object instanceof TWizardStep)
 		{
-- 
cgit v1.2.3