changeset 33:70c46caee508

* 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 diff
     1.1 --- a/Lang/ITranslatableWithActions.cs	Wed Jan 26 20:01:21 2011 +0000
     1.2 +++ b/Lang/ITranslatableWithActions.cs	Sun Feb 13 16:18:09 2011 +0000
     1.3 @@ -2,7 +2,6 @@
     1.4  //
     1.5  // 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.
     1.6  
     1.7 -using System;
     1.8  using IBBoard.Lang;
     1.9  using Gtk;
    1.10  using System.Collections.Generic;
     2.1 --- a/Translatable/ControlTranslator.cs	Wed Jan 26 20:01:21 2011 +0000
     2.2 +++ b/Translatable/ControlTranslator.cs	Sun Feb 13 16:18:09 2011 +0000
     2.3 @@ -2,7 +2,6 @@
     2.4  // 
     2.5  // // 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.
     2.6  
     2.7 -using System;
     2.8  using Gtk;
     2.9  using IBBoard.Lang;
    2.10  
    2.11 @@ -72,7 +71,7 @@
    2.12  			}
    2.13  		}
    2.14  
    2.15 -		private static void TranslateAction(Action action)
    2.16 +		private static void TranslateAction(Gtk.Action action)
    2.17  		{
    2.18  			action.Label = Translation.GetTranslation(action.Name, action.Label);
    2.19  		}
     3.1 --- a/Translatable/TranslatableWindowWithActions.cs	Wed Jan 26 20:01:21 2011 +0000
     3.2 +++ b/Translatable/TranslatableWindowWithActions.cs	Sun Feb 13 16:18:09 2011 +0000
     3.3 @@ -2,9 +2,9 @@
     3.4  // 
     3.5  // // 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.
     3.6  
     3.7 -using System;
     3.8  using System.Collections.Generic;
     3.9  using Gtk;
    3.10 +using System;
    3.11  
    3.12  namespace IBBoard.GtkSharp.Translatable
    3.13  {
    3.14 @@ -26,7 +26,7 @@
    3.15  			//Do nothing extra
    3.16  		}
    3.17  
    3.18 -		public abstract ICollection<Action> Actions
    3.19 +		public abstract ICollection<Gtk.Action> Actions
    3.20  		{
    3.21  			get;
    3.22  		}