Includes TStack as core class.

3 files changed, 13 insertions, 8 deletions

diff --git a/buildscripts/phpbuilder/files.txt b/buildscripts/phpbuilder/files.txt
index b1b970a6..0ec9127f 100644
--- a/buildscripts/phpbuilder/files.txt
+++ b/buildscripts/phpbuilder/files.txt
@@ -4,6 +4,7 @@ Exceptions/TException.php
 

 Collections/TList.php

 Collections/TMap.php

+Collections/TStack.php

 Collections/TAttributeCollection.php

 # Collections/TPagedDataSource.php

 # Collections/TDummyDataSource.php

diff --git a/framework/Web/UI/WebControls/TDataGrid.php b/framework/Web/UI/WebControls/TDataGrid.php
index c6e46c72..d9924cd2 100644
--- a/framework/Web/UI/WebControls/TDataGrid.php
+++ b/framework/Web/UI/WebControls/TDataGrid.php
@@ -142,7 +142,7 @@ class TDataGrid extends TBaseDataList implements INamingContainer
 	const CMD_SORT='Sort';

 	const CMD_PAGE='Page';

 	const CMD_PAGE_NEXT='Next';

-	const CMD_PAGE_PREV='Prev';

+	const CMD_PAGE_PREV='Previous';

 

 	/**

 	 * @var TDataGridColumnCollection manually created column collection

@@ -1138,8 +1138,8 @@ class TDataGrid extends TBaseDataList implements INamingContainer
 		{

 			$button=$this->createPagerButton($buttonType,true);

 			$button->setText($style->getPrevPageText());

-			$button->setCommandName('page');

-			$button->setCommandParameter('prev');

+			$button->setCommandName(self::CMD_PAGE);

+			$button->setCommandParameter(self::CMD_PAGE_PREV);

 			$button->setCausesValidation(false);

 			$controls->add($button);

 		}

@@ -1154,8 +1154,8 @@ class TDataGrid extends TBaseDataList implements INamingContainer
 		{

 			$button=$this->createPagerButton($buttonType,true);

 			$button->setText($style->getNextPageText());

-			$button->setCommandName('page');

-			$button->setCommandParameter('next');

+			$button->setCommandName(self::CMD_PAGE);

+			$button->setCommandParameter(self::CMD_PAGE_NEXT);

 			$button->setCausesValidation(false);

 			$controls->add($button);

 		}

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

 			$button=$this->createPagerButton($buttonType,true);

 			$button->setText($style->getPrevPageText());

-			$button->setCommandName('page');

+			$button->setCommandName(self::CMD_PAGE);

 			$button->setCommandParameter($startPageIndex-1);

 			$button->setCausesValidation(false);

 			$controls->add($button);

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

 				$button=$this->createPagerButton($buttonType,true);

 				$button->setText("$i");

-				$button->setCommandName('page');

+				$button->setCommandName(self::CMD_PAGE);

 				$button->setCommandParameter($i);

 				$button->setCausesValidation(false);

 				$controls->add($button);

@@ -1226,7 +1226,7 @@ class TDataGrid extends TBaseDataList implements INamingContainer
 			$controls->add(' ');

 			$button=$this->createPagerButton($buttonType,true);

 			$button->setText($style->getNextPageText());

-			$button->setCommandName('page');

+			$button->setCommandName(self::CMD_PAGE);

 			$button->setCommandParameter($endPageIndex+1);

 			$button->setCausesValidation(false);

 			$controls->add($button);

diff --git a/framework/core.php b/framework/core.php
index 56fe12e7..cd66e08c 100644
--- a/framework/core.php
+++ b/framework/core.php
@@ -38,6 +38,10 @@ require_once(PRADO_DIR.'/Collections/TList.php');
  */

 require_once(PRADO_DIR.'/Collections/TMap.php');

 /**

+ * Includes TStack definition

+ */

+require_once(PRADO_DIR.'/Collections/TStack.php');

+/**

  * Includes TXmlDocument, TXmlElement definition

  */

 require_once(PRADO_DIR.'/Data/TXmlDocument.php');