summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY1
-rw-r--r--framework/Web/UI/TControl.php2
-rw-r--r--framework/Web/UI/TTemplateControl.php2
-rw-r--r--framework/Web/UI/WebControls/TWizard.php4
4 files changed, 5 insertions, 4 deletions
diff --git a/HISTORY b/HISTORY
index 14c81b0c..492a70d5 100644
--- a/HISTORY
+++ b/HISTORY
@@ -26,6 +26,7 @@ CHG: Updated the javascript Prototype library, a few utilties functions REMOVED,
CHG: Build javascript without compression, only comments are removed. (Wei)
CHG: TDatePicker's date can be set using Date property, it value must be in same format as DateFormat, TimeStamp must be set as integer (wei)
CHG: TSimpleDateFormatter::parse() now return an integer or null on parse error (Wei)
+CHG: TControl::createControls() is changed to public. (Qiang)
NEW: TListControlValidator (Wei)
NEW: TClientScript (Wei)
diff --git a/framework/Web/UI/TControl.php b/framework/Web/UI/TControl.php
index d0db2139..5becd7e6 100644
--- a/framework/Web/UI/TControl.php
+++ b/framework/Web/UI/TControl.php
@@ -866,7 +866,7 @@ class TControl extends TApplicationComponent implements IRenderable, IBindable
* Do not call this method directly. Instead, call {@link ensureChildControls}
* to ensure child controls are created only once.
*/
- protected function createChildControls()
+ public function createChildControls()
{
}
diff --git a/framework/Web/UI/TTemplateControl.php b/framework/Web/UI/TTemplateControl.php
index 971f0288..f18678f1 100644
--- a/framework/Web/UI/TTemplateControl.php
+++ b/framework/Web/UI/TTemplateControl.php
@@ -123,7 +123,7 @@ class TTemplateControl extends TControl implements INamingContainer
* This method is overriden to load and instantiate control template.
* This method should only be used by framework and control developers.
*/
- protected function createChildControls()
+ public function createChildControls()
{
if($tpl=$this->getTemplate(true))
{
diff --git a/framework/Web/UI/WebControls/TWizard.php b/framework/Web/UI/WebControls/TWizard.php
index 0db7180e..de30fb0e 100644
--- a/framework/Web/UI/WebControls/TWizard.php
+++ b/framework/Web/UI/WebControls/TWizard.php
@@ -1006,7 +1006,7 @@ class TWizard extends TWebControl implements INamingContainer
/**
* Creates child controls within the wizard
*/
- protected function createChildControls()
+ public function createChildControls()
{
$this->reset();
$this->createSideBar();
@@ -1651,7 +1651,7 @@ class TTemplatedWizardStep extends TWizardStep implements INamingContainer
* Creates child controls.
* This method mainly instantiates the content template, if any.
*/
- protected function createChildControls()
+ public function createChildControls()
{
$this->getControls()->clear();
if($this->_contentTemplate)