merge

1 files changed, 2 insertions, 14 deletions

diff --git a/Software/Visual_Studio/Tango.Touch/Keyboard/TouchKeyboard.cs b/Software/Visual_Studio/Tango.Touch/Keyboard/TouchKeyboard.cs
index 9a6b7227f..1856fd2ac 100644
--- a/Software/Visual_Studio/Tango.Touch/Keyboard/TouchKeyboard.cs
+++ b/Software/Visual_Studio/Tango.Touch/Keyboard/TouchKeyboard.cs
@@ -67,14 +67,6 @@ namespace Tango.Touch.Keyboard
         public static readonly DependencyProperty ModeProperty =
             DependencyProperty.Register("Mode", typeof(TouchKeyboardMode), typeof(TouchKeyboard), new PropertyMetadata(TouchKeyboardMode.AlphaNumeric));
 
-        public KeyboardOutputMode OutputMode
-        {
-            get { return (KeyboardOutputMode)GetValue(OutputModeProperty); }
-            set { SetValue(OutputModeProperty, value); }
-        }
-        public static readonly DependencyProperty OutputModeProperty =
-            DependencyProperty.Register("OutputMode", typeof(KeyboardOutputMode), typeof(TouchKeyboard), new PropertyMetadata(KeyboardOutputMode.Wpf));
-
         public KeyboardActionKeyMode ActionKeyMode
         {
             get { return (KeyboardActionKeyMode)GetValue(ActionKeyModeProperty); }
@@ -497,7 +489,7 @@ namespace Tango.Touch.Keyboard
             }
 
 
-            if (key.Length > 1 || (isSpecialChar && definition.KeysLinesDefinitions.SelectMany(x => x.KeyDefinitions).Select(x => x.StandardText).Contains(key)) || OutputMode == KeyboardOutputMode.Windows)
+            if (key.Length > 1 || (isSpecialChar && definition.KeysLinesDefinitions.SelectMany(x => x.KeyDefinitions).Select(x => x.StandardText).Contains(key)))
             {
                 Core.Threading.ThreadFactory.StartNew(() =>
                 {
@@ -505,13 +497,9 @@ namespace Tango.Touch.Keyboard
                     {
                         Forms.SendKeys.SendWait(key);
                     }
-                    else if (key != " ")
-                    {
-                        Forms.SendKeys.SendWait("{" + key + "}");
-                    }
                     else
                     {
-                        Forms.SendKeys.SendWait(" ");
+                        Forms.SendKeys.SendWait("{" + key + "}");
                     }
 
                     Forms.SendKeys.Flush();