BE AWARE: Significant change!

Changed event definition from XXX to OnXXX.

17 files changed, 77 insertions, 69 deletions

diff --git a/demos/composer/protected/pages/ClassDefinition.php b/demos/composer/protected/pages/ClassDefinition.php
index 54e143e4..bd704b0e 100644
--- a/demos/composer/protected/pages/ClassDefinition.php
+++ b/demos/composer/protected/pages/ClassDefinition.php
@@ -173,7 +173,7 @@ class ClassDefinition extends TComponent
 				continue;

 			$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 on$name(\$param)\n\t{\n\t\t\$this->raiseEvent('$name',\$this,\$param);\n\t}\n");

+			$writer->write("\tpublic function $name(\$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 7a0dd635..23ab2b86 100644
--- a/demos/composer/protected/pages/Home.page
+++ b/demos/composer/protected/pages/Home.page
@@ -89,12 +89,12 @@ implements <com:TTextBox ID="Interfaces" CssClass="slTextBox"/>
 

 </com:TRepeater>

 

-<com:TButton Text="New Property" Command="propertyAction" CommandName="add" />

+<com:TButton Text="New Property" OnCommand="propertyAction" CommandName="add" />

 

 </com:TPanel>

 

 <com:TPanel GroupingText="Event Definitions">

-<com:TRepeater ID="EventList" ItemCommand="eventAction">

+<com:TRepeater ID="EventList" OnItemCommand="eventAction">

 

 <prop:HeaderTemplate>

 <table>

@@ -141,7 +141,7 @@ implements <com:TTextBox ID="Interfaces" CssClass="slTextBox"/>
 

 </com:TRepeater>

 

-<com:TButton Text="New Event" Command="eventAction" CommandName="add" />

+<com:TButton Text="New Event" OnCommand="eventAction" CommandName="add" />

 

 </com:TPanel>

 

@@ -161,7 +161,7 @@ Author Email
 <br/>

 

 <hr/>

-<com:TButton Text="Generate Code" Click="generateCode" />

+<com:TButton Text="Generate Code" OnClick="generateCode" />

 <com:TTextHighlighter>

 <com:TLiteral ID="SourceCode" />

 </com:TTextHighlighter>

diff --git a/demos/personal/protected/Pages/Layout.tpl b/demos/personal/protected/Pages/Layout.tpl
index f1064231..897bf04b 100644
--- a/demos/personal/protected/Pages/Layout.tpl
+++ b/demos/personal/protected/Pages/Layout.tpl
@@ -25,7 +25,7 @@
 <com:TLinkButton

 	Text="LOGOUT"

 	Visible=<%= !$this->User->IsGuest %>

-	Click="logout"

+	OnClick="logout"

 	/>

 </div>

 </div>

diff --git a/demos/quickstart/protected/controls/Layout.tpl b/demos/quickstart/protected/controls/Layout.tpl
index 1ff77361..e874bb37 100644
--- a/demos/quickstart/protected/controls/Layout.tpl
+++ b/demos/quickstart/protected/controls/Layout.tpl
@@ -15,7 +15,7 @@
 <div id="menu">

 <a href="?">Home</a> |

 <a href="http://www.pradosoft.com">PradoSoft.com</a> |

-<com:TLinkButton Text="Hide TOC" Click="toggleTopicPanel" />

+<com:TLinkButton Text="Hide TOC" OnClick="toggleTopicPanel" />

 </div>

 

 <table width="100%" border="0" cellspacing="0" cellpadding="0">

diff --git a/demos/quickstart/protected/pages/Configurations/Templates1.page b/demos/quickstart/protected/pages/Configurations/Templates1.page
index 37a389ba..102ee035 100644
--- a/demos/quickstart/protected/pages/Configurations/Templates1.page
+++ b/demos/quickstart/protected/pages/Configurations/Templates1.page
@@ -23,7 +23,7 @@ body content
 <p>

 It is required that component tags nest properly with each other and an opening component tag be paired with a closing tag, similar to that in XML. The following shows a component tag specifying the <tt>Text</tt> property and <tt>Click</tt> event of a button control,

 <com:TTextHighlighter Language="prado" CssClass="source">

-&lt;com:TButton Text="Register" Click="registerUser" />

+&lt;com:TButton Text="Register" OnClick="registerUser" />

 </com:TTextHighlighter>

 </p>

 <p>

diff --git a/demos/quickstart/protected/pages/Controls/Samples/TBulletedList/Home.page b/demos/quickstart/protected/pages/Controls/Samples/TBulletedList/Home.page
index c85ff574..77cc9f7c 100644
--- a/demos/quickstart/protected/pages/Controls/Samples/TBulletedList/Home.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/TBulletedList/Home.page
@@ -67,7 +67,7 @@ Bulleted list of hyperlinks:
 Bulleted list of link buttons (click on them to see the result):

 </td>

 <td class="sampleaction">

-<com:TBulletedList DisplayMode="LinkButton" Click="buttonClicked">

+<com:TBulletedList DisplayMode="LinkButton" OnClick="buttonClicked">

   <com:TListItem Value="http://www.google.com/" Text="google" />

   <com:TListItem Value="http://www.yahoo.com/" Text="yahoo" />

   <com:TListItem Value="http://www.amazon.com/" Text="amazon" />

diff --git a/demos/quickstart/protected/pages/Controls/Samples/TButton/Home.page b/demos/quickstart/protected/pages/Controls/Samples/TButton/Home.page
index eb1bc235..3d49331f 100644
--- a/demos/quickstart/protected/pages/Controls/Samples/TButton/Home.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/TButton/Home.page
@@ -19,7 +19,7 @@ Button with customized color, font and width:
 <tr><td class="samplenote">

 A click button:

 </td><td class="sampleaction">

-<com:TButton Text="click me" Click="buttonClicked" />

+<com:TButton Text="click me" OnClick="buttonClicked" />

 </td></tr>

 

 <tr><td class="samplenote">

@@ -27,7 +27,7 @@ A command button:
 </td><td class="sampleaction">

 <com:TButton

 	Text="click me"

-	Command="buttonClicked"

+	OnCommand="buttonClicked"

 	CommandName="test"

 	CommandParameter="value"

 	/>

diff --git a/demos/quickstart/protected/pages/Controls/Samples/TCheckBoxList/Home.page b/demos/quickstart/protected/pages/Controls/Samples/TCheckBoxList/Home.page
index d4833ea9..bc750cb8 100644
--- a/demos/quickstart/protected/pages/Controls/Samples/TCheckBoxList/Home.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/TCheckBoxList/Home.page
@@ -107,7 +107,7 @@ Check box list's behavior upon postback:
   <com:TListItem Value="value 4" Text="item 4" Enabled="false" />

   <com:TListItem Value="value 5" Text="item 5" Selected="true" />

 </com:TCheckBoxList>

-<com:TButton Text="Submit" Click="buttonClicked" />

+<com:TButton Text="Submit" OnClick="buttonClicked" />

 <br/>

 <com:TLabel ID="SelectionResult" ForeColor="red" />

 </td>

@@ -118,7 +118,9 @@ Check box list's behavior upon postback:
 Auto postback check box list:

 </td>

 <td class="sampleaction">

-<com:TCheckBoxList AutoPostBack="true" SelectedIndexChanged="selectionChanged">

+<com:TCheckBoxList

+	AutoPostBack="true"

+	OnSelectedIndexChanged="selectionChanged">

   <com:TListItem Value="value 1" Text="item 1" />

   <com:TListItem Value="value 2" Text="item 2" Selected="true" />

   <com:TListItem Value="value 3" Text="item 3" />

diff --git a/demos/quickstart/protected/pages/Controls/Samples/TDropDownList/Home.page b/demos/quickstart/protected/pages/Controls/Samples/TDropDownList/Home.page
index 3554729b..5123cc94 100644
--- a/demos/quickstart/protected/pages/Controls/Samples/TDropDownList/Home.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/TDropDownList/Home.page
@@ -32,7 +32,7 @@ Dropdown list with initial items:
 List box with customized row number, color and font:

 </td>

 <td class="sampleaction">

-<com:TDropDownList Rows="3" ForeColor="blue" Font.Size="14pt">

+<com:TDropDownList ForeColor="blue" Font.Size="14pt">

   <com:TListItem Value="value 1" Text="item 1" />

   <com:TListItem Value="value 2" Text="item 2" Selected="true" />

   <com:TListItem Value="value 3" Text="item 3" />

@@ -60,7 +60,9 @@ Disabled dropdown list:
 Auto postback dropdown list:

 </td>

 <td class="sampleaction">

-<com:TDropDownList AutoPostBack="true" SelectedIndexChanged="selectionChanged">

+<com:TDropDownList

+	AutoPostBack="true"

+	OnSelectedIndexChanged="selectionChanged">

   <com:TListItem Value="value 1" Text="item 1" />

   <com:TListItem Value="value 2" Text="item 2" Selected="true" />

   <com:TListItem Value="value 3" Text="item 3" />

@@ -81,7 +83,7 @@ Dropdown list's behavior upon postback:
   <com:TListItem Value="value 3" Text="item 3" />

   <com:TListItem Value="value 4" Text="item 4" />

 </com:TDropDownList>

-<com:TButton Text="Submit" Click="buttonClicked"/>

+<com:TButton Text="Submit" OnClick="buttonClicked"/>

 <com:TLabel ID="SelectionResult2" ForeColor="red" />

 </td>

 </tr>

diff --git a/demos/quickstart/protected/pages/Controls/Samples/TLinkButton/Home.page b/demos/quickstart/protected/pages/Controls/Samples/TLinkButton/Home.page
index 497e5083..f0e0b9cd 100644
--- a/demos/quickstart/protected/pages/Controls/Samples/TLinkButton/Home.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/TLinkButton/Home.page
@@ -26,7 +26,7 @@ body content
 <tr><td class="samplenote">

 A click link button:

 </td><td class="sampleaction">

-<com:TLinkButton Text="click me" Click="buttonClicked" />

+<com:TLinkButton Text="click me" OnClick="buttonClicked" />

 </td></tr>

 

 <tr><td class="samplenote">

@@ -34,7 +34,7 @@ A command link button:
 </td><td class="sampleaction">

 <com:TLinkButton

 	Text="click me"

-	Command="buttonClicked"

+	OnCommand="buttonClicked"

 	CommandName="test"

 	CommandParameter="value"

 	/>

diff --git a/demos/quickstart/protected/pages/Controls/Samples/TListBox/Home.page b/demos/quickstart/protected/pages/Controls/Samples/TListBox/Home.page
index 66ac4fa2..161f68a4 100644
--- a/demos/quickstart/protected/pages/Controls/Samples/TListBox/Home.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/TListBox/Home.page
@@ -62,7 +62,9 @@ Disabled list box:
 Auto postback list box:

 </td>

 <td class="sampleaction">

-<com:TListBox AutoPostBack="true" SelectedIndexChanged="selectionChanged">

+<com:TListBox

+	AutoPostBack="true"

+	OnSelectedIndexChanged="selectionChanged">

   <com:TListItem Value="value 1" Text="item 1" />

   <com:TListItem Value="value 2" Text="item 2" Selected="true" />

   <com:TListItem Value="value 3" Text="item 3" />

@@ -83,7 +85,7 @@ List box's behavior upon postback:
   <com:TListItem Value="value 3" Text="item 3" />

   <com:TListItem Value="value 4" Text="item 4" />

 </com:TListBox>

-<com:TButton Text="Submit" Click="buttonClicked"/>

+<com:TButton Text="Submit" OnClick="buttonClicked"/>

 <com:TLabel ID="SelectionResult2" ForeColor="red" />

 </td>

 </tr>

@@ -131,7 +133,7 @@ List box's behavior upon postback:
   <com:TListItem Value="value 3" Text="item 3" />

   <com:TListItem Value="value 4" Text="item 4" Selected="true" />

 </com:TListBox>

-<com:TButton Text="Submit" Click="buttonClicked2" />

+<com:TButton Text="Submit" OnClick="buttonClicked2" />

 <br/>

 <com:TLabel ID="MultiSelectionResult2" ForeColor="red" />

 </td>

@@ -144,7 +146,7 @@ Auto postback list box:
 <td class="sampleaction">

 <com:TListBox AutoPostBack="true"

 	SelectionMode="Multiple"

-	SelectedIndexChanged="multiSelectionChanged">

+	OnSelectedIndexChanged="multiSelectionChanged">

   <com:TListItem Value="value 1" Text="item 1" />

   <com:TListItem Value="value 2" Text="item 2" Selected="true" />

   <com:TListItem Value="value 3" Text="item 3" />

@@ -170,7 +172,7 @@ Databind to an integer-indexed array:
 <com:TListBox ID="DBListBox1"

 	AutoPostBack="true"

 	SelectionMode="Multiple"

-	SelectedIndexChanged="DBListBox1Changed" />

+	OnSelectedIndexChanged="DBListBox1Changed" />

 <com:TLabel ID="DBListBox1Result" ForeColor="red" />

 </td>

 </tr>

@@ -183,7 +185,7 @@ Databind to an associative array:
 <com:TListBox ID="DBListBox2"

 	AutoPostBack="true"

 	SelectionMode="Multiple"

-	SelectedIndexChanged="DBListBox2Changed" />

+	OnSelectedIndexChanged="DBListBox2Changed" />

 <com:TLabel ID="DBListBox2Result" ForeColor="red" />

 </td>

 </tr>

@@ -198,7 +200,7 @@ Databind with DataTextField and DataValueField specified:
 	SelectionMode="Multiple"

 	DataTextField="name"

 	DataValueField="id"

-	SelectedIndexChanged="DBListBox3Changed" />

+	OnSelectedIndexChanged="DBListBox3Changed" />

 <com:TLabel ID="DBListBox3Result" ForeColor="red" />

 </td>

 </tr>

diff --git a/demos/quickstart/protected/pages/Controls/Samples/TPanel/Home.page b/demos/quickstart/protected/pages/Controls/Samples/TPanel/Home.page
index c5c0d538..794b9dd0 100644
--- a/demos/quickstart/protected/pages/Controls/Samples/TPanel/Home.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/TPanel/Home.page
@@ -58,8 +58,8 @@ Panel with a default button (hit 'enter' key to see what happened):
 This is panel content with a <com:TLabel Text="label" Font.Italic="true" />

 and two buttons: <br/>

 <com:TCheckBox />

-<com:TButton ID="Button1" Text="button1" Click="buttonClicked" />

-<com:TButton ID="Button2" Text="button2" Click="buttonClicked" />

+<com:TButton ID="Button1" Text="button1" OnClick="buttonClicked" />

+<com:TButton ID="Button2" Text="button2" OnClick="buttonClicked" />

 <com:TLabel ID="Result" ForeColor="red" />

 <br/>

 When you change focus to the panel and hit 'enter' key, <tt>button2</tt>

diff --git a/demos/quickstart/protected/pages/Controls/Samples/TRadioButtonList/Home.page b/demos/quickstart/protected/pages/Controls/Samples/TRadioButtonList/Home.page
index 3f5f7053..a65c4d2d 100644
--- a/demos/quickstart/protected/pages/Controls/Samples/TRadioButtonList/Home.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/TRadioButtonList/Home.page
@@ -107,7 +107,7 @@ Radio button list's behavior upon postback:
   <com:TListItem Value="value 4" Text="item 4" Enabled="false" />

   <com:TListItem Value="value 5" Text="item 5" />

 </com:TRadioButtonList>

-<com:TButton Text="Submit" Click="buttonClicked" />

+<com:TButton Text="Submit" OnClick="buttonClicked" />

 <br/>

 <com:TLabel ID="SelectionResult" ForeColor="red" />

 </td>

@@ -118,7 +118,9 @@ Radio button list's behavior upon postback:
 Auto postback radio button list:

 </td>

 <td class="sampleaction">

-<com:TRadioButtonList AutoPostBack="true" SelectedIndexChanged="selectionChanged">

+<com:TRadioButtonList

+	AutoPostBack="true"

+	OnSelectedIndexChanged="selectionChanged">

   <com:TListItem Value="value 1" Text="item 1" />

   <com:TListItem Value="value 2" Text="item 2" Selected="true" />

   <com:TListItem Value="value 3" Text="item 3" />

diff --git a/demos/quickstart/protected/pages/Controls/Samples/TTextBox/Home.page b/demos/quickstart/protected/pages/Controls/Samples/TTextBox/Home.page
index f771b2ba..7bbe1744 100644
--- a/demos/quickstart/protected/pages/Controls/Samples/TTextBox/Home.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/TTextBox/Home.page
@@ -51,7 +51,7 @@ Auto postback text box not causing validation:
 	Text="change me"

 	AutoPostBack="true"

 	CausesValidation="false"

-	TextChanged="textChanged" />

+	OnTextChanged="textChanged" />

 </td></tr>

 

 <tr><td class="samplenote">

@@ -76,7 +76,7 @@ Text box's behavior upon postback:
 <com:TButton

 	Text="Submit"

 	CausesValidation="false"

-	Click="submitText" />

+	OnClick="submitText" />

 </td></tr>

 

 <tr><td class="samplenote">

@@ -148,7 +148,7 @@ Auto postback text box not causing validation:
 	Text="change me"

 	AutoPostBack="true"

 	CausesValidation="false"

-	TextChanged="textChanged" />

+	OnTextChanged="textChanged" />

 </td></tr>

 

 <tr><td class="samplenote">

diff --git a/demos/quickstart/protected/pages/Fundamentals/Components.page b/demos/quickstart/protected/pages/Fundamentals/Components.page
index 32d82e1c..c419a5fa 100644
--- a/demos/quickstart/protected/pages/Fundamentals/Components.page
+++ b/demos/quickstart/protected/pages/Fundamentals/Components.page
@@ -58,7 +58,7 @@ $component-&gt;getFont()-&gt;setName( $name );
 Component events are special properties that take method names as their values. Attaching (setting) a method to an event will hook up the method to the places at which the event is raised. Therefore, the behavior of a component can be modified in a way that may not be foreseen during the development of the component.

 </p>

 <p>

-A component event is defined by the existence of an <tt>on</tt>-method. For example, in <tt>TButton</tt>, we have

+A component event is defined by the existence of a method whose name starts with the word <tt>on</tt>. The event name is the method name and is thus case-insensitve. For example, in <tt>TButton</tt>, we have

 <com:TTextHighlighter CssClass="source">

 class TButton extends TWebControl {

     public function onClick( $param ) {

@@ -66,12 +66,12 @@ class TButton extends TWebControl {
     }

 }

 </com:TTextHighlighter>

-This defines an event named <tt>Click</tt>, and a handler can be attached to the event using one of the following ways,

+This defines an event named <tt>OnClick</tt>, and a handler can be attached to the event using one of the following ways,

 <com:TTextHighlighter CssClass="source">

-$button->Click = $callback;

-$button->Click->add( $callback );

-$button->Click[] = $callback;

-$button->attachEventHandler( 'Click' , $callback );

+$button->OnClick = $callback;

+$button->OnClick->add( $callback );

+$button->OnClick[] = $callback;

+$button->attachEventHandler( 'OnClick' , $callback );

 </com:TTextHighlighter>

 where <tt>$callback</tt> refers to a valid PHP callback (e.g. a function name, a class method <tt>array($object,'method')</tt>, etc.)

 </p>

diff --git a/demos/quickstart/protected/pages/Fundamentals/Samples/Hangman/Home.page b/demos/quickstart/protected/pages/Fundamentals/Samples/Hangman/Home.page
index bae7b308..977b2a04 100644
--- a/demos/quickstart/protected/pages/Fundamentals/Samples/Hangman/Home.page
+++ b/demos/quickstart/protected/pages/Fundamentals/Samples/Hangman/Home.page
@@ -11,7 +11,7 @@ If you make too many mistakes, you lose the game!</p>
   <com:TListItem Value="5" Text="Medium game; you are allowed 5 misses."/>

   <com:TListItem Value="3" Text="Hard game; you are allowed 3 misses."/>

 </com:TRadioButtonList>

-<com:TButton Text="Play!" Click="selectLevel" />

+<com:TButton Text="Play!" OnClick="selectLevel" />

 <com:TLabel ID="LevelError" Text="You must choose a difficulty level!" ForeColor="red" Visible="false" />

 </com:TPanel>

 

@@ -21,46 +21,46 @@ If you make too many mistakes, you lose the game!</p>
 <p>You have made <%=$this->Page->Misses %> bad guesses

 out of a maximum of <%= $this->Page->Level %>.</p>

 <p>Guess:

-<com:TLinkButton ID="GuessA" Text="A" Click="guessWord" />

-<com:TLinkButton ID="GuessB" Text="B" Click="guessWord" />

-<com:TLinkButton ID="GuessC" Text="C" Click="guessWord" />

-<com:TLinkButton ID="GuessD" Text="D" Click="guessWord" />

-<com:TLinkButton ID="GuessE" Text="E" Click="guessWord" />

-<com:TLinkButton ID="GuessF" Text="F" Click="guessWord" />

-<com:TLinkButton ID="GuessG" Text="G" Click="guessWord" />

-<com:TLinkButton ID="GuessH" Text="H" Click="guessWord" />

-<com:TLinkButton ID="GuessI" Text="I" Click="guessWord" />

-<com:TLinkButton ID="GuessJ" Text="J" Click="guessWord" />

-<com:TLinkButton ID="GuessK" Text="K" Click="guessWord" />

-<com:TLinkButton ID="GuessL" Text="L" Click="guessWord" />

-<com:TLinkButton ID="GuessM" Text="M" Click="guessWord" />

-<com:TLinkButton ID="GuessN" Text="N" Click="guessWord" />

-<com:TLinkButton ID="GuessO" Text="O" Click="guessWord" />

-<com:TLinkButton ID="GuessP" Text="P" Click="guessWord" />

-<com:TLinkButton ID="GuessQ" Text="Q" Click="guessWord" />

-<com:TLinkButton ID="GuessR" Text="R" Click="guessWord" />

-<com:TLinkButton ID="GuessS" Text="S" Click="guessWord" />

-<com:TLinkButton ID="GuessT" Text="T" Click="guessWord" />

-<com:TLinkButton ID="GuessU" Text="U" Click="guessWord" />

-<com:TLinkButton ID="GuessV" Text="V" Click="guessWord" />

-<com:TLinkButton ID="GuessW" Text="W" Click="guessWord" />

-<com:TLinkButton ID="GuessX" Text="X" Click="guessWord" />

-<com:TLinkButton ID="GuessY" Text="Y" Click="guessWord" />

-<com:TLinkButton ID="GuessZ" Text="Z" Click="guessWord" />

+<com:TLinkButton ID="GuessA" Text="A" OnClick="guessWord" />

+<com:TLinkButton ID="GuessB" Text="B" OnClick="guessWord" />

+<com:TLinkButton ID="GuessC" Text="C" OnClick="guessWord" />

+<com:TLinkButton ID="GuessD" Text="D" OnClick="guessWord" />

+<com:TLinkButton ID="GuessE" Text="E" OnClick="guessWord" />

+<com:TLinkButton ID="GuessF" Text="F" OnClick="guessWord" />

+<com:TLinkButton ID="GuessG" Text="G" OnClick="guessWord" />

+<com:TLinkButton ID="GuessH" Text="H" OnClick="guessWord" />

+<com:TLinkButton ID="GuessI" Text="I" OnClick="guessWord" />

+<com:TLinkButton ID="GuessJ" Text="J" OnClick="guessWord" />

+<com:TLinkButton ID="GuessK" Text="K" OnClick="guessWord" />

+<com:TLinkButton ID="GuessL" Text="L" OnClick="guessWord" />

+<com:TLinkButton ID="GuessM" Text="M" OnClick="guessWord" />

+<com:TLinkButton ID="GuessN" Text="N" OnClick="guessWord" />

+<com:TLinkButton ID="GuessO" Text="O" OnClick="guessWord" />

+<com:TLinkButton ID="GuessP" Text="P" OnClick="guessWord" />

+<com:TLinkButton ID="GuessQ" Text="Q" OnClick="guessWord" />

+<com:TLinkButton ID="GuessR" Text="R" OnClick="guessWord" />

+<com:TLinkButton ID="GuessS" Text="S" OnClick="guessWord" />

+<com:TLinkButton ID="GuessT" Text="T" OnClick="guessWord" />

+<com:TLinkButton ID="GuessU" Text="U" OnClick="guessWord" />

+<com:TLinkButton ID="GuessV" Text="V" OnClick="guessWord" />

+<com:TLinkButton ID="GuessW" Text="W" OnClick="guessWord" />

+<com:TLinkButton ID="GuessX" Text="X" OnClick="guessWord" />

+<com:TLinkButton ID="GuessY" Text="Y" OnClick="guessWord" />

+<com:TLinkButton ID="GuessZ" Text="Z" OnClick="guessWord" />

 </p>

-<p><com:TLinkButton Text="Give up?" Click="giveUp" /></p>

+<p><com:TLinkButton Text="Give up?" OnClick="giveUp" /></p>

 </com:TPanel>

 

 <com:TPanel ID="WinPanel" Visible="false">

 <h2>You Win!</h2>

 <p>The word was: <%= $this->Page->Word %>.</p>

-<p><com:TLinkButton Text="Start Again" Click="startAgain" /></p>

+<p><com:TLinkButton Text="Start Again" OnClick="startAgain" /></p>

 </com:TPanel>

 

 <com:TPanel ID="LosePanel" Visible="false">

 <h2>You Lose!</h2>

 <p>The word was: <%= $this->Page->Word %>.</p>

-<p><com:TLinkButton Text="Start Again" Click="startAgain" /></p>

+<p><com:TLinkButton Text="Start Again" OnClick="startAgain" /></p>

 </com:TPanel>

 

 </com:TContent>
\ No newline at end of file
diff --git a/demos/quickstart/protected/pages/Fundamentals/Samples/HelloWorld/Home.page b/demos/quickstart/protected/pages/Fundamentals/Samples/HelloWorld/Home.page
index 8931dad6..60c7c3e2 100644
--- a/demos/quickstart/protected/pages/Fundamentals/Samples/HelloWorld/Home.page
+++ b/demos/quickstart/protected/pages/Fundamentals/Samples/HelloWorld/Home.page
@@ -1,6 +1,6 @@
 <%@ Title="Hello World" %>

 <com:TContent ID="body">

 

-<com:TButton Text="Click Me" Click="buttonClicked" />

+<com:TButton Text="Click Me" OnClick="buttonClicked" />

 

 </com:TContent>
\ No newline at end of file