fix #371

2 files changed, 24 insertions, 7 deletions

diff --git a/framework/Web/UI/ActiveControls/TActiveDataGrid.php b/framework/Web/UI/ActiveControls/TActiveDataGrid.php
index bd32db5e..c4ad9640 100644
--- a/framework/Web/UI/ActiveControls/TActiveDataGrid.php
+++ b/framework/Web/UI/ActiveControls/TActiveDataGrid.php
@@ -52,10 +52,19 @@ Prado::using('System.Web.UI.WebControls.TCheckBoxColumn');
  * @since 3.1.9
  */
 class TActiveDataGrid extends TDataGrid implements IActiveControl, ISurroundable {
-/**
- * Creates a new callback control, sets the adapter to
- * TActiveControlAdapter.
- */
+
+	/**
+	 * @return string Name of the class used in AutoGenerateColumns mode
+	 */
+	protected function getAutoGenerateColumnName()
+	{
+		return 'TActiveBoundColumn';
+	}
+
+	/**
+	* Creates a new callback control, sets the adapter to
+	* TActiveControlAdapter.
+	*/
 	public function __construct() {
 		parent::__construct();
 		$this->setAdapter(new TActiveControlAdapter($this));
diff --git a/framework/Web/UI/WebControls/TDataGrid.php b/framework/Web/UI/WebControls/TDataGrid.php
index 3d06363a..ede67b89 100644
--- a/framework/Web/UI/WebControls/TDataGrid.php
+++ b/framework/Web/UI/WebControls/TDataGrid.php
@@ -9,7 +9,7 @@
  *

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

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2011 PradoSoft
+ * @copyright Copyright &copy; 2005-2011 PradoSoft

  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System.Web.UI.WebControls

@@ -227,6 +227,14 @@ class TDataGrid extends TBaseDataList implements INamingContainer
 	}

 

 	/**

+	 * @return string Name of the class used in AutoGenerateColumns mode

+	 */

+	protected function getAutoGenerateColumnName()

+	{

+		return 'TBoundColumn';

+	}

+

+	/**

 	 * Adds objects parsed in template to datagrid.

 	 * Datagrid columns are added into {@link getColumns Columns} collection.

 	 * @param mixed object parsed in template

@@ -909,7 +917,7 @@ class TDataGrid extends TBaseDataList implements INamingContainer
 				$this->_autoColumns=new TDataGridColumnCollection($this);

 				foreach($state as $st)

 				{

-					$column=new TBoundColumn;

+					$column=new $this->AutoGenerateColumnName;

 					$column->loadState($st);

 					$this->_autoColumns->add($column);

 				}

@@ -1404,7 +1412,7 @@ class TDataGrid extends TBaseDataList implements INamingContainer
 		{

 			foreach($row as $key=>$value)

 			{

-				$column=new TBoundColumn;

+				$column=new $this->AutoGenerateColumnName;

 				if(is_string($key))

 				{

 					$column->setHeaderText($key);