From 90b3f22cba8ad85ef2eb38c158fa2da46d798cf8 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Fri, 8 Sep 2006 19:31:03 +0000
Subject: merge from 3.0 branch till 1397.

---
 framework/Web/UI/WebControls/TTemplateColumn.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

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

diff --git a/framework/Web/UI/WebControls/TTemplateColumn.php b/framework/Web/UI/WebControls/TTemplateColumn.php
index f83e3290..7235fc8c 100644
--- a/framework/Web/UI/WebControls/TTemplateColumn.php
+++ b/framework/Web/UI/WebControls/TTemplateColumn.php
@@ -6,7 +6,7 @@
  * @link http://www.pradosoft.com/
  * @copyright Copyright &copy; 2005 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Revision: $  $Date: $
+ * @version $Id$
  * @package System.Web.UI.WebControls
  */
 
@@ -28,7 +28,7 @@ Prado::using('System.Web.UI.WebControls.TDataGridColumn');
  * header will be displayed with {@link setHeaderText HeaderText}.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Revision: $  $Date: $
+ * @version $Id$
  * @package System.Web.UI.WebControls
  * @since 3.0
  */
@@ -138,18 +138,18 @@ class TTemplateColumn extends TDataGridColumn
 		$template=null;
 		switch($itemType)
 		{
-			case TDataGrid::IT_HEADER:
+			case TListItemType::Header:
 				$template=$this->_headerTemplate;
 				break;
-			case TDataGrid::IT_FOOTER:
+			case TListItemType::Footer:
 				$template=$this->_footerTemplate;
 				break;
-			case TDataGrid::IT_ITEM:
-			case TDataGrid::IT_ALTERNATINGITEM:
-			case TDataGrid::IT_SELECTEDITEM:
+			case TListItemType::Item:
+			case TListItemType::AlternatingItem:
+			case TListItemType::SelectedItem:
 				$template=$this->_itemTemplate;
 				break;
-			case TDataGrid::IT_EDITITEM:
+			case TListItemType::EditItem:
 				$template=$this->_editItemTemplate===null?$this->_itemTemplate:$this->_editItemTemplate;
 				break;
 		}
@@ -159,7 +159,7 @@ class TTemplateColumn extends TDataGridColumn
 			$cell->getControls()->clear();
 			$template->instantiateIn($cell);
 		}
-		else if($itemType===TDataGrid::IT_ITEM || $itemType===TDataGrid::IT_ALTERNATINGITEM || $itemType===TDataGrid::IT_SELECTEDITEM || $itemType===TDataGrid::IT_EDITITEM)
+		else if($itemType===TListItemType::Item || $itemType===TListItemType::AlternatingItem || $itemType===TListItemType::SelectedItem || $itemType===TListItemType::EditItem)
 			$cell->setText('&nbsp;');
 	}
 }
-- 
cgit v1.2.3