From 27478826035da62e1cba07833101b162558f895a Mon Sep 17 00:00:00 2001
From: xue <>
Date: Thu, 4 May 2006 03:02:44 +0000
Subject: Merge from 3.0 branch till 1016.

---
 framework/Web/UI/WebControls/TWizard.php | 58 ++++++++++++++++++++++++++++++--
 1 file changed, 56 insertions(+), 2 deletions(-)

(limited to 'framework/Web/UI/WebControls/TWizard.php')

diff --git a/framework/Web/UI/WebControls/TWizard.php b/framework/Web/UI/WebControls/TWizard.php
index 20e27f2b..2d2815ba 100644
--- a/framework/Web/UI/WebControls/TWizard.php
+++ b/framework/Web/UI/WebControls/TWizard.php
@@ -597,6 +597,54 @@ class TWizard extends TWebControl implements INamingContainer
 		$this->setViewState('UseDefaultLayout',TPropertyValue::ensureBoolean($value),true);
 	}
 
+	/**
+	 * @return TPanel container of the wizard header
+	 */
+	public function getHeader()
+	{
+		return $this->_header;
+	}
+
+	/**
+	 * @return TPanel container of the wizard step content
+	 */
+	public function getStepContent()
+	{
+		return $this->_stepContent;
+	}
+
+	/**
+	 * @return TPanel container of the wizard side bar
+	 */
+	public function getSideBar()
+	{
+		return $this->_sideBar;
+	}
+
+	/**
+	 * @var TWizardNavigationContainer container of the start navigation
+	 */
+	public function getStartNavigation()
+	{
+		return $this->_startNavigation;
+	}
+
+	/**
+	 * @var TWizardNavigationContainer container of the step navigation
+	 */
+	public function getStepNavigation()
+	{
+		return $this->_stepNavigation;
+	}
+
+	/**
+	 * @var TWizardNavigationContainer container of the finish navigation
+	 */
+	public function getFinishNavigation()
+	{
+		return $this->_finishNavigation;
+	}
+
 	/**
 	 * Raises <b>OnActiveStepChanged</b> event.
 	 * This event is raised when the current visible step is changed in the
@@ -845,8 +893,13 @@ class TWizard extends TWebControl implements INamingContainer
 		$activeStep=$this->getActiveStep();
 		$activeStepIndex=$this->getActiveStepIndex();
 
-		if(!$this->_navigation || $activeStepIndex<0 || $activeStepIndex>=$wizardSteps->getCount())
+		if(!$this->_navigation)
+			return;
+		else if($activeStepIndex<0 || $activeStepIndex>=$wizardSteps->getCount())
+		{
+			$this->_navigation->setVisible(false);
 			return;
+		}
 
 		// set visibility of different types of navigation panel
 		$showStandard=true;
@@ -1135,7 +1188,8 @@ class TWizard extends TWebControl implements INamingContainer
 		$this->_stepContent=new TPanel;
 		$this->_stepContent->getControls()->add($multiView);
 		$this->getControls()->add($this->_stepContent);
-		$multiView->setActiveViewIndex(0);
+		if($multiView->getViews()->getCount())
+			$multiView->setActiveViewIndex(0);
 	}
 
 	/**
-- 
cgit v1.2.3