merge from 3.0 branch till 1387

1 files changed, 4 insertions, 5 deletions

diff --git a/framework/Web/UI/WebControls/TCheckBoxList.php b/framework/Web/UI/WebControls/TCheckBoxList.php
index e6ca3642..21cc330b 100644
--- a/framework/Web/UI/WebControls/TCheckBoxList.php
+++ b/framework/Web/UI/WebControls/TCheckBoxList.php
@@ -116,20 +116,19 @@ class TCheckBoxList extends TListControl implements IRepeatInfoUser, INamingCont
 	}

 

 	/**

-	 * @return string the alignment of the text caption, defaults to 'Right'.

+	 * @return TTextAlign the alignment of the text caption, defaults to TTextAlign::Right.

 	 */

 	public function getTextAlign()

 	{

-		return $this->getViewState('TextAlign','Right');

+		return $this->getViewState('TextAlign',TTextAlign::Right);

 	}

 

 	/**

-	 * Sets the text alignment of the checkboxes

-	 * @param string either 'Left' or 'Right'

+	 * @param TTextAlign the text alignment of the checkboxes

 	 */

 	public function setTextAlign($value)

 	{

-		$this->setViewState('TextAlign',TPropertyValue::ensureEnum($value,array('Left','Right')),'Right');

+		$this->setViewState('TextAlign',TPropertyValue::ensureEnum($value,'TTextAlign'),TTextAlign::Right);

 	}