From ffc189729b2ce96c35dc78a754dfb15b478c5220 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Tue, 11 Apr 2006 17:31:08 +0000
Subject: Fixed a few inconsistency due to change of template parsing.

---
 .../protected/pages/Controls/Samples/TWizard/Sample3.page           | 6 +++---
 .../protected/pages/Controls/Samples/TWizard/Sample4.page           | 2 +-
 framework/Web/UI/TControl.php                                       | 2 +-
 framework/Web/UI/WebControls/TWizard.php                            | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/demos/quickstart/protected/pages/Controls/Samples/TWizard/Sample3.page b/demos/quickstart/protected/pages/Controls/Samples/TWizard/Sample3.page
index aa43a0f9..a12502f7 100644
--- a/demos/quickstart/protected/pages/Controls/Samples/TWizard/Sample3.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/TWizard/Sample3.page
@@ -18,14 +18,14 @@ In the following survey, if you are a college student, you will be asked which m
 		OnCompleteButtonClick="wizard3Completed" >
 
   <com:TWizardStep Title="Background" AllowReturn="false">
-    <b><%= $this->Parent->Title %></b>
+    <b><%= $this->Title %></b>
     <br/><br/>
     <com:TCheckBox ID="StudentCheckBox" Text="I am a college student." />
     <br/><br/>
   </com:TWizardStep>
 
   <com:TWizardStep Title="Major" AllowReturn="false">
-    <b><%= $this->Parent->Title %></b>
+    <b><%= $this->Title %></b>
     <br/><br/>
     My major is
       <com:TDropDownList ID="DropDownList11">
@@ -38,7 +38,7 @@ In the following survey, if you are a college student, you will be asked which m
   </com:TWizardStep>
 
   <com:TWizardStep Title="Hobbies" AllowReturn="false">
-    <b><%= $this->Parent->Title %></b>
+    <b><%= $this->Title %></b>
     <br/><br/>
     My favorite Sport is
       <com:TDropDownList ID="DropDownList22">
diff --git a/demos/quickstart/protected/pages/Controls/Samples/TWizard/Sample4.page b/demos/quickstart/protected/pages/Controls/Samples/TWizard/Sample4.page
index 8687d842..f4313c7f 100644
--- a/demos/quickstart/protected/pages/Controls/Samples/TWizard/Sample4.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/TWizard/Sample4.page
@@ -14,7 +14,7 @@
 		<prop:HeaderTemplate>
 		<i>Header Template</i>
 		<br/>
-		<b>Step <%= $this->Parent->Parent->ActiveStepIndex+1 %> of 3</b>
+		<b>Step <%= $this->Parent->ActiveStepIndex+1 %> of 3</b>
 		</prop:HeaderTemplate>
 
 		<prop:SideBarTemplate>
diff --git a/framework/Web/UI/TControl.php b/framework/Web/UI/TControl.php
index 15965a74..7b22760f 100644
--- a/framework/Web/UI/TControl.php
+++ b/framework/Web/UI/TControl.php
@@ -1101,7 +1101,7 @@ class TControl extends TApplicationComponent implements IRenderable, IBindable
 		$control->_page=null;
 		$control->_namingContainer=null;
 		$control->_tplControl=null;
-		$control->_stage=self::CS_CONSTRUCTED;
+		//$control->_stage=self::CS_CONSTRUCTED;
 		if(!($control->_flags & self::IS_ID_SET))
 			$control->_id='';
 		else
diff --git a/framework/Web/UI/WebControls/TWizard.php b/framework/Web/UI/WebControls/TWizard.php
index ef4691bd..fd849d3d 100644
--- a/framework/Web/UI/WebControls/TWizard.php
+++ b/framework/Web/UI/WebControls/TWizard.php
@@ -189,7 +189,7 @@ class TWizard extends TWebControl implements INamingContainer
 	 */
 	public function addParsedObject($object)
 	{
-		if(is_object($object))
+		if($object instanceof TWizardStep)
 			$this->getWizardSteps()->add($object);
 	}
 
-- 
cgit v1.2.3