reverted r2801, r2803, r2829's madness.

1 files changed, 19 insertions, 78 deletions

diff --git a/framework/Web/UI/TPage.php b/framework/Web/UI/TPage.php
index 6b49b99c..a681667d 100644
--- a/framework/Web/UI/TPage.php
+++ b/framework/Web/UI/TPage.php
@@ -22,12 +22,11 @@ Prado::using('System.Web.UI.TClientScriptManager');
  * TPage class

  *

  * @author Qiang Xue <qiang.xue@gmail.com>

- * @author Brad Anderson <javalizard@gmail.com>

  * @version $Id$

  * @package System.Web.UI

  * @since 3.0

  */

-class TPage extends TTemplateControl implements IPageEvents

+class TPage extends TTemplateControl

 {

 	/**

 	 * system post fields

@@ -209,30 +208,30 @@ class TPage extends TTemplateControl implements IPageEvents
 	protected function processNormalRequest($writer)

 	{

 		Prado::trace("Page onPreInit()",'System.Web.UI.TPage');

-		$this->onPreInit($this);

+		$this->onPreInit(null);

 

 		Prado::trace("Page initRecursive()",'System.Web.UI.TPage');

 		$this->initRecursive();

 

 		Prado::trace("Page onInitComplete()",'System.Web.UI.TPage');

-		$this->onInitComplete($this);

+		$this->onInitComplete(null);

 

 		Prado::trace("Page onPreLoad()",'System.Web.UI.TPage');

-		$this->onPreLoad($this);

+		$this->onPreLoad(null);

 		Prado::trace("Page loadRecursive()",'System.Web.UI.TPage');

 		$this->loadRecursive();

 		Prado::trace("Page onLoadComplete()",'System.Web.UI.TPage');

-		$this->onLoadComplete($this);

+		$this->onLoadComplete(null);

 

 		Prado::trace("Page preRenderRecursive()",'System.Web.UI.TPage');

 		$this->preRenderRecursive();

 		Prado::trace("Page onPreRenderComplete()",'System.Web.UI.TPage');

-		$this->onPreRenderComplete($this);

+		$this->onPreRenderComplete(null);

 

 		Prado::trace("Page savePageState()",'System.Web.UI.TPage');

 		$this->savePageState();

 		Prado::trace("Page onSaveStateComplete()",'System.Web.UI.TPage');

-		$this->onSaveStateComplete($this);

+		$this->onSaveStateComplete(null);

 

 		Prado::trace("Page renderControl()",'System.Web.UI.TPage');

 		$this->renderControl($writer);

@@ -243,13 +242,13 @@ class TPage extends TTemplateControl implements IPageEvents
 	protected function processPostBackRequest($writer)

 	{

 		Prado::trace("Page onPreInit()",'System.Web.UI.TPage');

-		$this->onPreInit($this);

+		$this->onPreInit(null);

 

 		Prado::trace("Page initRecursive()",'System.Web.UI.TPage');

 		$this->initRecursive();

 

 		Prado::trace("Page onInitComplete()",'System.Web.UI.TPage');

-		$this->onInitComplete($this);

+		$this->onInitComplete(null);

 

 		$this->_restPostData=new TMap;

 		Prado::trace("Page loadPageState()",'System.Web.UI.TPage');

@@ -257,7 +256,7 @@ class TPage extends TTemplateControl implements IPageEvents
 		Prado::trace("Page processPostData()",'System.Web.UI.TPage');

 		$this->processPostData($this->_postData,true);

 		Prado::trace("Page onPreLoad()",'System.Web.UI.TPage');

-		$this->onPreLoad($this);

+		$this->onPreLoad(null);

 		Prado::trace("Page loadRecursive()",'System.Web.UI.TPage');

 		$this->loadRecursive();

 		Prado::trace("Page processPostData()",'System.Web.UI.TPage');

@@ -267,17 +266,17 @@ class TPage extends TTemplateControl implements IPageEvents
 		Prado::trace("Page raisePostBackEvent()",'System.Web.UI.TPage');

 		$this->raisePostBackEvent();

 		Prado::trace("Page onLoadComplete()",'System.Web.UI.TPage');

-		$this->onLoadComplete($this);

+		$this->onLoadComplete(null);

 

 		Prado::trace("Page preRenderRecursive()",'System.Web.UI.TPage');

 		$this->preRenderRecursive();

 		Prado::trace("Page onPreRenderComplete()",'System.Web.UI.TPage');

-		$this->onPreRenderComplete($this);

+		$this->onPreRenderComplete(null);

 

 		Prado::trace("Page savePageState()",'System.Web.UI.TPage');

 		$this->savePageState();

 		Prado::trace("Page onSaveStateComplete()",'System.Web.UI.TPage');

-		$this->onSaveStateComplete($this);

+		$this->onSaveStateComplete(null);

 

 		Prado::trace("Page renderControl()",'System.Web.UI.TPage');

 		$this->renderControl($writer);

@@ -302,13 +301,13 @@ class TPage extends TTemplateControl implements IPageEvents
                     $this->_postData[$k]=iconv('UTF-8',$enc.'//IGNORE',$v);

 

 		Prado::trace("Page onPreInit()",'System.Web.UI.TPage');

-		$this->onPreInit($this);

+		$this->onPreInit(null);

 

 		Prado::trace("Page initRecursive()",'System.Web.UI.TPage');

 		$this->initRecursive();

 

 		Prado::trace("Page onInitComplete()",'System.Web.UI.TPage');

-		$this->onInitComplete($this);

+		$this->onInitComplete(null);

 

 		$this->_restPostData=new TMap;

 		Prado::trace("Page loadPageState()",'System.Web.UI.TPage');

@@ -316,7 +315,7 @@ class TPage extends TTemplateControl implements IPageEvents
 		Prado::trace("Page processPostData()",'System.Web.UI.TPage');

 		$this->processPostData($this->_postData,true);

 		Prado::trace("Page onPreLoad()",'System.Web.UI.TPage');

-		$this->onPreLoad($this);

+		$this->onPreLoad(null);

 		Prado::trace("Page loadRecursive()",'System.Web.UI.TPage');

 		$this->loadRecursive();

 

@@ -334,17 +333,17 @@ class TPage extends TTemplateControl implements IPageEvents
 		$this->raisePostBackEvent();

 */

 		Prado::trace("Page onLoadComplete()",'System.Web.UI.TPage');

-		$this->onLoadComplete($this);

+		$this->onLoadComplete(null);

 

 		Prado::trace("Page preRenderRecursive()",'System.Web.UI.TPage');

 		$this->preRenderRecursive();

 		Prado::trace("Page onPreRenderComplete()",'System.Web.UI.TPage');

-		$this->onPreRenderComplete($this);

+		$this->onPreRenderComplete(null);

 

 		Prado::trace("Page savePageState()",'System.Web.UI.TPage');

 		$this->savePageState();

 		Prado::trace("Page onSaveStateComplete()",'System.Web.UI.TPage');

-		$this->onSaveStateComplete($this);

+		$this->onSaveStateComplete(null);

 

 /*

 		Prado::trace("Page renderControl()",'System.Web.UI.TPage');

@@ -1225,64 +1224,6 @@ class TPage extends TTemplateControl implements IPageEvents
 	}

 }

 

-

-/**

- * IPageEvents interface.

- *

- * IPageEvents interface has all the events a page uses during its life cycle.

- *

- * @author Brad Anderson <javalizard@gmail.com>

- * @version $Id$

- * @package System.Web.UI

- * @since 3.2

- */

-interface IPageEvents {

-	/**

-	 * Raises 'OnDataBinding' event. (inherited from TControl)

-	 */

-	public function onDataBinding($param);

-	/**

-	 * This method is invoked when the control enters 'OnInit' stage. (inherited from TControl)

-	 */

-	public function onInit($param);

-	/**

-	 * Raises OnInitComplete event.

-	 */

-	public function onInitComplete($param);

-	/**

-	 * This method is invoked when the control enters 'OnLoad' stage. (inherited from TControl)

-	 */

-	public function onLoad($param);

-	/**

-	 * Raises OnLoadComplete event.

-	 */

-	public function onLoadComplete($param);

-	/**

-	 * Raises OnPreInit event.

-	 */

-	public function onPreInit($param);

-	/**

-	 * Raises OnPreLoad event.

-	 */

-	public function onPreLoad($param);

-	/**

-	 * This method is invoked when the control enters 'OnPreRender' stage. (inherited from TControl)

-	 */

-	public function onPreRender($param);

-	/**

-	 * Raises OnPreRenderComplete event.

-	 */

-	public function onPreRenderComplete($param);

-	/**

-	 * Raises OnSaveStateComplete event.

-	 */

-	public function onSaveStateComplete($param);

-	/**

-	 * This method is invoked when the control enters 'OnUnload' stage. (inherited from TControl)

-	 */

-	public function onUnload($param);

-}

-

 /**

  * IPageStatePersister interface.

  *