From 0892b27e326f14bd3f6229b55077ef5f9d5280b4 Mon Sep 17 00:00:00 2001
From: "ctrlaltca@gmail.com" <>
Date: Sat, 21 May 2011 18:14:36 +0000
Subject: branch/3.1: merged bugfixes from trunk/ up to current

---
 framework/Web/UI/WebControls/TWizard.php | 6 ++++++
 1 file changed, 6 insertions(+)

(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 774096f7..a9268b2b 100644
--- a/framework/Web/UI/WebControls/TWizard.php
+++ b/framework/Web/UI/WebControls/TWizard.php
@@ -954,6 +954,8 @@ class TWizard extends TWebControl implements INamingContainer
 			if($buttonStyle!==null)
 				$style->mergeWith($buttonStyle);
 			$style->apply($button);
+			if($activeStepType===TWizardStepType::Start)
+				$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
 		}
 
 		// apply styles to finish navigation buttons
@@ -977,6 +979,8 @@ class TWizard extends TWebControl implements INamingContainer
 			if($buttonStyle!==null)
 				$style->mergeWith($buttonStyle);
 			$style->apply($button);
+			if($activeStepType===TWizardStepType::Finish)
+				$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
 		}
 
 		// apply styles to step navigation buttons
@@ -1000,6 +1004,8 @@ class TWizard extends TWebControl implements INamingContainer
 			if($buttonStyle!==null)
 				$style->mergeWith($buttonStyle);
 			$style->apply($button);
+			if($activeStepType===TWizardStepType::Step)
+				$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
 		}
 	}
 
-- 
cgit v1.2.3