From 8f475577c570f1317b6b0826a2d8081e4f65875a Mon Sep 17 00:00:00 2001
From: Mike Kestner <mkestner@gmail.com>
Date: Sun, 7 Oct 2001 13:21:13 +0000
Subject: [PATCH] 2001-10-07  Mike Kestner <mkestner@speakeasy.net>

	* gtk/Button.cs : Some nomenclature changes.  s/EmitClicked/Click, etc.
	We need a consistent way to deal with naming clashes in gtk's method
	and signal namespaces.  When clashes exist, events will be made past
	tense and methods to programatically emit events will be the present
	tense (e.g. Clicked event and Click method).

svn path=/trunk/gtk-sharp/; revision=1116
---
 ChangeLog     |  8 ++++++++
 gtk/Button.cs | 32 ++++++++++++++++----------------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a8b91739d..a2a6e1505 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-10-07  Mike Kestner <mkestner@speakeasy.net>
+
+	* gtk/Button.cs : Some nomenclature changes.  s/EmitClicked/Click, etc.
+	We need a consistent way to deal with naming clashes in gtk's method
+	and signal namespaces.  When clashes exist, events will be made past
+	tense and methods to programatically emit events will be the present 
+	tense (e.g. Clicked event and Click method).
+
 2001-10-07  Mike Kestner <mkestner@speakeasy.net>
 
 	* glib/Object.cs : Added public Handle property.  It would be nice
diff --git a/gtk/Button.cs b/gtk/Button.cs
index 6fdb9ce21..34d1f477e 100644
--- a/gtk/Button.cs
+++ b/gtk/Button.cs
@@ -214,7 +214,7 @@ namespace Gtk {
 		}
 
 		/// <summary>
-		///	Activate Event
+		///	Activated Event
 		/// </summary>
 		/// 
 		/// <remarks>
@@ -223,7 +223,7 @@ namespace Gtk {
 
 		private static readonly string ActName = "activate";
 
-		public event EventHandler Activate
+		public event EventHandler Activated
 		{
 			add {
 				if (Events [ActName] == null)
@@ -268,7 +268,7 @@ namespace Gtk {
 		}
 
 		/// <summary>
-		///	Enter Event
+		///	Entered Event
 		/// </summary>
 		/// 
 		/// <remarks>
@@ -277,7 +277,7 @@ namespace Gtk {
 
 		private static readonly string EnterName = "enter";
 
-		public event EventHandler Enter
+		public event EventHandler Entered
 		{
 			add {
 				if (Events [EnterName] == null)
@@ -295,7 +295,7 @@ namespace Gtk {
 		}
 
 		/// <summary>
-		///	Leave Event
+		///	Left Event
 		/// </summary>
 		/// 
 		/// <remarks>
@@ -304,7 +304,7 @@ namespace Gtk {
 
 		private static readonly string LeaveName = "leave";
 
-		public event EventHandler Leave
+		public event EventHandler Left
 		{
 			add {
 				if (Events [LeaveName] == null)
@@ -376,7 +376,7 @@ namespace Gtk {
 		}
 
 		/// <summary>
-		///	EmitClicked Method
+		///	Click Method
 		/// </summary>
 		/// 
 		/// <remarks>
@@ -387,13 +387,13 @@ namespace Gtk {
 		[DllImport("gtk-1.3.dll")]
 		static extern void gtk_button_clicked (IntPtr obj);
 
-		public void EmitClicked ()
+		public void Click ()
 		{
 			gtk_button_clicked (RawObject);
 		}
 
 		/// <summary>
-		///	EmitEnter Method
+		///	Enter Method
 		/// </summary>
 		/// 
 		/// <remarks>
@@ -404,13 +404,13 @@ namespace Gtk {
 		[DllImport("gtk-1.3.dll")]
 		static extern void gtk_button_enter (IntPtr obj);
 
-		public void EmitEnter ()
+		public void Enter ()
 		{
 			gtk_button_enter (RawObject);
 		}
 
 		/// <summary>
-		///	EmitLeave Method
+		///	Leave Method
 		/// </summary>
 		/// 
 		/// <remarks>
@@ -421,13 +421,13 @@ namespace Gtk {
 		[DllImport("gtk-1.3.dll")]
 		static extern void gtk_button_leave (IntPtr obj);
 
-		public void EmitLeave ()
+		public void Leave ()
 		{
 			gtk_button_leave (RawObject);
 		}
 
 		/// <summary>
-		///	EmitPressed Method
+		///	Pressed Method
 		/// </summary>
 		/// 
 		/// <remarks>
@@ -438,13 +438,13 @@ namespace Gtk {
 		[DllImport("gtk-1.3.dll")]
 		static extern void gtk_button_pressed (IntPtr obj);
 
-		public void EmitPressed ()
+		public void Press ()
 		{
 			gtk_button_pressed (RawObject);
 		}
 
 		/// <summary>
-		///	EmitReleased Method
+		///	Release Method
 		/// </summary>
 		/// 
 		/// <remarks>
@@ -455,7 +455,7 @@ namespace Gtk {
 		[DllImport("gtk-1.3.dll")]
 		static extern void gtk_button_released (IntPtr obj);
 
-		public void EmitReleased ()
+		public void Release ()
 		{
 			gtk_button_released (RawObject);
 		}