From a66e3a8afb63d472b3ec92a406538dfc0a492efb Mon Sep 17 00:00:00 2001
From: xue <>
Date: Fri, 14 Apr 2006 12:55:01 +0000
Subject: merge from branch 3.0 till 908.

---
 framework/Web/UI/WebControls/TImageButton.php |  1 +
 framework/Web/UI/WebControls/TMultiView.php   | 10 ++++++++++
 framework/Web/UI/WebControls/TWizard.php      | 10 ----------
 3 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'framework/Web/UI')

diff --git a/framework/Web/UI/WebControls/TImageButton.php b/framework/Web/UI/WebControls/TImageButton.php
index e5e5f3b9..655b1df0 100644
--- a/framework/Web/UI/WebControls/TImageButton.php
+++ b/framework/Web/UI/WebControls/TImageButton.php
@@ -124,6 +124,7 @@ class TImageButton extends TImage implements IPostBackDataHandler, IPostBackEven
 		$options['ID'] = $this->getClientID();
 		$options['CausesValidation'] = $this->getCausesValidation();
 		$options['ValidationGroup'] = $this->getValidationGroup();
+		$options['EventTarget'] = $this->getUniqueID();
 
 		return $options;
 	}
diff --git a/framework/Web/UI/WebControls/TMultiView.php b/framework/Web/UI/WebControls/TMultiView.php
index 5f4f3d84..6dd0d8f1 100644
--- a/framework/Web/UI/WebControls/TMultiView.php
+++ b/framework/Web/UI/WebControls/TMultiView.php
@@ -247,6 +247,16 @@ class TMultiView extends TControl
 		return false;
 	}
 
+	/**
+	 * Loads state into the wizard.
+	 * This method is invoked by the framework when the control state is being saved.
+	 */
+	public function loadState()
+	{
+		// a dummy call to ensure the view is activated
+		$this->getActiveView();
+	}
+
 	/**
 	 * Renders the currently active view.
 	 * @param THtmlWriter the writer for the rendering purpose.
diff --git a/framework/Web/UI/WebControls/TWizard.php b/framework/Web/UI/WebControls/TWizard.php
index 426fd73d..794fb4da 100644
--- a/framework/Web/UI/WebControls/TWizard.php
+++ b/framework/Web/UI/WebControls/TWizard.php
@@ -734,16 +734,6 @@ class TWizard extends TWebControl implements INamingContainer
 			$history->push($index);
 	}
 
-	/**
-	 * Loads state into the wizard.
-	 * This method is invoked by the framework when the control state is being saved.
-	 */
-	public function loadState()
-	{
-		// a dummy call to ensure the step is activated
-		$this->getActiveStep();
-	}
-
 	/**
 	 * Indicates the wizard needs to recreate all child controls.
 	 */
-- 
cgit v1.2.3