From 70944795827cffd1bd5a27a9c4a99eb1434f905f Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sat, 15 Apr 2006 14:35:46 +0000
Subject: Merge from branch 3.0 till 913.

---
 demos/composer/protected/pages/ClassDefinition.php | 15 +++++++--
 demos/composer/protected/pages/Home.page           | 38 +++++++++++-----------
 2 files changed, 31 insertions(+), 22 deletions(-)

(limited to 'demos/composer')

diff --git a/demos/composer/protected/pages/ClassDefinition.php b/demos/composer/protected/pages/ClassDefinition.php
index bd704b0e..cb657e85 100644
--- a/demos/composer/protected/pages/ClassDefinition.php
+++ b/demos/composer/protected/pages/ClassDefinition.php
@@ -36,8 +36,8 @@ class ClassDefinition extends TComponent
 		if($this->Comments!=='')
 		{
 			$str.=" *\n";
-			$str.=implode("\n * ",explode("\n",wordwrap($this->Comments)));
-			$str.=" *\n\n";
+			$str.=" * ".implode("\n * ",explode("\n",wordwrap($this->Comments)));
+			$str.="\n *\n";
 		}
 		if($this->Author!=='')
 		{
@@ -171,9 +171,18 @@ class ClassDefinition extends TComponent
 			$name=$event->Name;
 			if($name==='')
 				continue;
+			if(strncasecmp($name,'on',2)!==0)
+				$name='On'.$name;
+			else
+			{
+				$name[0]='O';
+				$name[1]='n';
+			}
+			$methodName=$name;
+			$methodName[0]='o';
 			$comments=implode("\n\t * ",explode("\n",wordwrap($event->Comments)));
 			$writer->write("\n\t/**\n\t * Raises <b>$name</b> event.\n\t * $comments\n\t * @param TEventParameter event parameter\n\t */\n");
-			$writer->write("\tpublic function $name(\$param)\n\t{\n\t\t\$this->raiseEvent('$name',\$this,\$param);\n\t}\n");
+			$writer->write("\tpublic function $methodName(\$param)\n\t{\n\t\t\$this->raiseEvent('$name',\$this,\$param);\n\t}\n");
 		}
 	}
 
diff --git a/demos/composer/protected/pages/Home.page b/demos/composer/protected/pages/Home.page
index efdd1cda..51aaed8e 100644
--- a/demos/composer/protected/pages/Home.page
+++ b/demos/composer/protected/pages/Home.page
@@ -40,10 +40,10 @@ No properties defined.<br/>
 <prop:ItemTemplate>
 <tr>
   <td>
-  <com:TTextBox ID="PropertyName" Text=<%# $this->Parent->DataItem->Name %> CssClass="slTextBox"/>
+  <com:TTextBox ID="PropertyName" Text=<%# $this->DataItem->Name %> CssClass="slTextBox"/>
   </td>
   <td>
-  <com:TDropDownList ID="PropertyType" SelectedValue=<%# $this->Parent->DataItem->Type %> >
+  <com:TDropDownList ID="PropertyType" SelectedValue=<%# $this->DataItem->Type %> >
     <com:TListItem Text="string" />
     <com:TListItem Text="integer" />
     <com:TListItem Text="boolean" />
@@ -53,41 +53,41 @@ No properties defined.<br/>
   </com:TDropDownList>
   </td>
   <td>
-  <com:TTextBox ID="DefaultValue" Text=<%# $this->Parent->DataItem->DefaultValue %> CssClass="slTextBox"/>
+  <com:TTextBox ID="DefaultValue" Text=<%# $this->DataItem->DefaultValue %> CssClass="slTextBox"/>
   </td>
   <td>
-  <com:TDropDownList ID="Storage" SelectedValue=<%# $this->Parent->DataItem->Storage %> >
+  <com:TDropDownList ID="Storage" SelectedValue=<%# $this->DataItem->Storage %> >
     <com:TListItem Text="ViewState" />
     <com:TListItem Text="ControlState" />
     <com:TListItem Text="Memory" />
   </com:TDropDownList>
   </td>
   <td>
-  <com:TCheckBox ID="IsProtected" Text="protected" Checked=<%# $this->Parent->DataItem->IsProtected %> />
-  <com:TCheckBox ID="ReadOnly" Text="read-only" Checked=<%# $this->Parent->DataItem->ReadOnly %> />
+  <com:TCheckBox ID="IsProtected" Text="protected" Checked=<%# $this->DataItem->IsProtected %> />
+  <com:TCheckBox ID="ReadOnly" Text="read-only" Checked=<%# $this->DataItem->ReadOnly %> />
   </td>
   <td>
-  <com:TTextBox ID="Comments" Text=<%# $this->Parent->DataItem->Comments %> CssClass="slTextBox"/>
+  <com:TTextBox ID="Comments" Text=<%# $this->DataItem->Comments %> CssClass="slTextBox"/>
   </td>
   <td>
   <com:TButton
   		Text="Remove"
   		CommandName="remove"
-  		CommandParameter=<%# $this->Parent->ItemIndex %>
+  		CommandParameter=<%# $this->ItemIndex %>
   		CssClass="button"
   		/>
   <com:TButton
   		Text="Up"
   		CommandName="up"
-  		CommandParameter=<%# $this->Parent->ItemIndex %>
-  		Enabled=<%# $this->Parent->ItemIndex > 0%>
+  		CommandParameter=<%# $this->ItemIndex %>
+  		Enabled=<%# $this->ItemIndex > 0%>
   		CssClass="button"
   		/>
   <com:TButton
   		Text="Down"
   		CommandName="down"
-  		CommandParameter=<%# $this->Parent->ItemIndex %>
-  		Enabled=<%# $this->Parent->ItemIndex < $this->Page->ClassDefinition->Properties->Count-1 %>
+  		CommandParameter=<%# $this->ItemIndex %>
+  		Enabled=<%# $this->ItemIndex < $this->Page->ClassDefinition->Properties->Count-1 %>
   		CssClass="button"
   		/>
   </td>
@@ -123,30 +123,30 @@ No properties defined.<br/>
 <prop:ItemTemplate>
 <tr>
   <td>
-  <com:TTextBox ID="EventName" Text=<%# $this->Parent->DataItem->Name %> CssClass="slTextBox"/>
+  <com:TTextBox ID="EventName" Text=<%# $this->DataItem->Name %> CssClass="slTextBox"/>
   </td>
   <td>
-  <com:TTextBox ID="Comments" Text=<%# $this->Parent->DataItem->Comments %> CssClass="slTextBox"/>
+  <com:TTextBox ID="Comments" Text=<%# $this->DataItem->Comments %> CssClass="slTextBox"/>
   </td>
   <td>
   <com:TButton
   		Text="Remove"
   		CommandName="remove"
-  		CommandParameter=<%# $this->Parent->ItemIndex %>
+  		CommandParameter=<%# $this->ItemIndex %>
   		CssClass="button"
   		/>
   <com:TButton
   		Text="Up"
   		CommandName="up"
-  		CommandParameter=<%# $this->Parent->ItemIndex %>
-  		Enabled=<%# $this->Parent->ItemIndex > 0%>
+  		CommandParameter=<%# $this->ItemIndex %>
+  		Enabled=<%# $this->ItemIndex > 0%>
   		CssClass="button"
   		/>
   <com:TButton
   		Text="Down"
   		CommandName="down"
-  		CommandParameter=<%# $this->Parent->ItemIndex %>
-  		Enabled=<%# $this->Parent->ItemIndex < $this->Page->ClassDefinition->Events->Count-1 %>
+  		CommandParameter=<%# $this->ItemIndex %>
+  		Enabled=<%# $this->ItemIndex < $this->Page->ClassDefinition->Events->Count-1 %>
   		CssClass="button"
   		/>
   </td>
-- 
cgit v1.2.3