Mercurial > repos > IBBoard.GtkSharp

changeset 33:70c46caee508

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Resolve conflicts between System.Action and Gtk.Action no-open-ticket
author IBBoard <dev@ibboard.co.uk>
date Sun, 13 Feb 2011 16:18:09 +0000
parents 5e0e85cbfd6e
children ef1cf7814a6b
files Lang/ITranslatableWithActions.cs Translatable/ControlTranslator.cs Translatable/TranslatableWindowWithActions.cs
diffstat 3 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Lang/ITranslatableWithActions.cs	Wed Jan 26 20:01:21 2011 +0000
+++ b/Lang/ITranslatableWithActions.cs	Sun Feb 13 16:18:09 2011 +0000
@@ -2,7 +2,6 @@
 //
 // The file and the library/program it is in are licensed and distributed, without warranty, under the GNU LGPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license.
 
-using System;
 using IBBoard.Lang;
 using Gtk;
 using System.Collections.Generic;
--- a/Translatable/ControlTranslator.cs	Wed Jan 26 20:01:21 2011 +0000
+++ b/Translatable/ControlTranslator.cs	Sun Feb 13 16:18:09 2011 +0000
@@ -2,7 +2,6 @@
 // 
 // // The file and the library/program it is in are licensed and distributed, without warranty, under the GNU LGPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license.
 
-using System;
 using Gtk;
 using IBBoard.Lang;
 
@@ -72,7 +71,7 @@
 			}
 		}
 
-		private static void TranslateAction(Action action)
+		private static void TranslateAction(Gtk.Action action)
 		{
 			action.Label = Translation.GetTranslation(action.Name, action.Label);
 		}
--- a/Translatable/TranslatableWindowWithActions.cs	Wed Jan 26 20:01:21 2011 +0000
+++ b/Translatable/TranslatableWindowWithActions.cs	Sun Feb 13 16:18:09 2011 +0000
@@ -2,9 +2,9 @@
 // 
 // // The file and the library/program it is in are licensed and distributed, without warranty, under the GNU LGPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license.
 
-using System;
 using System.Collections.Generic;
 using Gtk;
+using System;
 
 namespace IBBoard.GtkSharp.Translatable
 {
@@ -26,7 +26,7 @@
 			//Do nothing extra
 		}
 
-		public abstract ICollection<Action> Actions
+		public abstract ICollection<Gtk.Action> Actions
 		{
 			get;
 		}