From 112d86bb08a1dd4bde14005f757c95b0fc7a5a21 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sun, 4 Jun 2006 20:51:27 +0000
Subject: Merge from 3.0 branch till 1140.

---
 framework/Web/UI/WebControls/TDataGrid.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

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

diff --git a/framework/Web/UI/WebControls/TDataGrid.php b/framework/Web/UI/WebControls/TDataGrid.php
index 82c243ca..d2625c0d 100644
--- a/framework/Web/UI/WebControls/TDataGrid.php
+++ b/framework/Web/UI/WebControls/TDataGrid.php
@@ -217,7 +217,7 @@ class TDataGrid extends TBaseDataList implements INamingContainer
 	}
 
 	/**
-	 * @return TDataGridColumnCollection automatically specified datagrid columns
+	 * @return TDataGridColumnCollection automatically generated datagrid columns
 	 */
 	public function getAutoColumns()
 	{
@@ -683,7 +683,6 @@ class TDataGrid extends TBaseDataList implements INamingContainer
 	}
 
 	/**
-	 * Handles <b>OnBubbleEvent</b>.
 	 * This method overrides parent's implementation to handle
 	 * {@link onItemCommand OnItemCommand} event which is bubbled from
 	 * {@link TDataGridItem} child controls.
@@ -696,7 +695,7 @@ class TDataGrid extends TBaseDataList implements INamingContainer
 	 * @param TEventParameter event parameter
 	 * @return boolean whether the event bubbling should stop here.
 	 */
-	public function onBubbleEvent($sender,$param)
+	public function bubbleEvent($sender,$param)
 	{
 		if($param instanceof TDataGridCommandEventParameter)
 		{
@@ -1890,14 +1889,13 @@ class TDataGridItem extends TTableRow implements INamingContainer
 	}
 
 	/**
-	 * Handles <b>BubbleEvent</b>.
 	 * This method overrides parent's implementation by wrapping event parameter
 	 * for <b>OnCommand</b> event with item information.
 	 * @param TControl the sender of the event
 	 * @param TEventParameter event parameter
 	 * @return boolean whether the event bubbling should stop here.
 	 */
-	public function onBubbleEvent($sender,$param)
+	public function bubbleEvent($sender,$param)
 	{
 		if($param instanceof TCommandEventParameter)
 		{
@@ -1934,14 +1932,13 @@ class TDataGridPager extends TPanel implements INamingContainer
 	}
 
 	/**
-	 * Handles <b>BubbleEvent</b>.
 	 * This method overrides parent's implementation by wrapping event parameter
 	 * for <b>OnCommand</b> event with item information.
 	 * @param TControl the sender of the event
 	 * @param TEventParameter event parameter
 	 * @return boolean whether the event bubbling should stop here.
 	 */
-	public function onBubbleEvent($sender,$param)
+	public function bubbleEvent($sender,$param)
 	{
 		if($param instanceof TCommandEventParameter)
 		{
-- 
cgit v1.2.3