From 0f2b34ef1ad76d94f43062f396b7a63e76051659 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Mon, 17 Apr 2006 21:32:48 +0000
Subject: Fixed a bug about control's visibility.

---
 framework/Web/UI/TControl.php            | 2 +-
 framework/Web/UI/WebControls/TWizard.php | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'framework')

diff --git a/framework/Web/UI/TControl.php b/framework/Web/UI/TControl.php
index 2a3a6a30..3fe34a4c 100644
--- a/framework/Web/UI/TControl.php
+++ b/framework/Web/UI/TControl.php
@@ -491,7 +491,7 @@ class TControl extends TApplicationComponent implements IRenderable, IBindable
 		if($checkParents)
 		{
 			for($control=$this;$control;$control=$control->_parent)
-				if(!$control->getViewState('Visible',true))
+				if(!$control->getVisible(false))
 					return false;
 			return true;
 		}
diff --git a/framework/Web/UI/WebControls/TWizard.php b/framework/Web/UI/WebControls/TWizard.php
index fd849d3d..67b84ccd 100644
--- a/framework/Web/UI/WebControls/TWizard.php
+++ b/framework/Web/UI/WebControls/TWizard.php
@@ -1293,6 +1293,8 @@ class TWizard extends TWebControl implements INamingContainer
 			$type=$this->getStepType($this->getActiveStep());
 			$index=$this->getActiveStepIndex();
 			$navParam=new TWizardNavigationEventParameter($index);
+			if($sender->canGetProperty('CausesValidation') && $sender->getCausesValidation() && ($page=$this->getPage())!==null && !$page->getIsValid())
+				$navParam->setCancelNavigation(true);
 
 			$handled=false;
 			$movePrev=false;
-- 
cgit v1.2.3