Merge from 3.0 branch till 894.

2 files changed, 4 insertions, 4 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>