[Cs-sdl-commits] SF.net SVN: cs-sdl: [1384] trunk/SdlDotNet

[<je...@us...>]

Revision: 1384
          http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1384&view=rev
Author:   jendave
Date:     2007-05-20 23:21:34 -0700 (Sun, 20 May 2007)

Log Message:
-----------
apply some bug fixes. bump version number

Modified Paths:
--------------
    trunk/SdlDotNet/package.xml
    trunk/SdlDotNet/scripts/win32installer/SdlDotNetRuntime.nsi
    trunk/SdlDotNet/scripts/win32installer/SdlDotNetSDK.nsi
    trunk/SdlDotNet/src/Input/Keyboard.cs
    trunk/SdlDotNet/src/Input/KeyboardEventArgs.cs
    trunk/SdlDotNet/src/Windows/SurfaceControl.cs

Modified: trunk/SdlDotNet/package.xml
===================================================================
--- trunk/SdlDotNet/package.xml	2007-05-18 21:37:04 UTC (rev 1383)
+++ trunk/SdlDotNet/package.xml	2007-05-21 06:21:34 UTC (rev 1384)
@@ -10,7 +10,7 @@
 
     <!-- global project settings -->
     <property name="project.config" value="Release" />
-    <property name="project.version" value="6.0.0" />
+    <property name="project.version" value="6.0.1" />
     <property name="src.dir" value="src" />
     <property name="examples.dir" value="examples" />
     <property name="extras.dir" value="extras" />

Modified: trunk/SdlDotNet/scripts/win32installer/SdlDotNetRuntime.nsi
===================================================================
--- trunk/SdlDotNet/scripts/win32installer/SdlDotNetRuntime.nsi	2007-05-18 21:37:04 UTC (rev 1383)
+++ trunk/SdlDotNet/scripts/win32installer/SdlDotNetRuntime.nsi	2007-05-21 06:21:34 UTC (rev 1384)
@@ -2,7 +2,7 @@
 
 !define PRODUCT_NAME "SDL.NET Runtime"
 !define PRODUCT_TYPE "runtime"
-!define PRODUCT_VERSION "6.0.0"
+!define PRODUCT_VERSION "6.0.1"
 !define PRODUCT_PUBLISHER "SDL.NET"
 !define PRODUCT_PACKAGE "sdldotnet"
 !define PRODUCT_WEB_SITE "http://cs-sdl.sourceforge.net"

Modified: trunk/SdlDotNet/scripts/win32installer/SdlDotNetSDK.nsi
===================================================================
--- trunk/SdlDotNet/scripts/win32installer/SdlDotNetSDK.nsi	2007-05-18 21:37:04 UTC (rev 1383)
+++ trunk/SdlDotNet/scripts/win32installer/SdlDotNetSDK.nsi	2007-05-21 06:21:34 UTC (rev 1384)
@@ -2,7 +2,7 @@
 
 !define PRODUCT_NAME "SDL.NET SDK"
 !define PRODUCT_TYPE "sdk"
-!define PRODUCT_VERSION "6.0.0"
+!define PRODUCT_VERSION "6.0.1"
 !define PRODUCT_PUBLISHER "SDL.NET"
 !define PRODUCT_PACKAGE "sdldotnet"
 !define PRODUCT_WEB_SITE "http://cs-sdl.sourceforge.net"

Modified: trunk/SdlDotNet/src/Input/Keyboard.cs
===================================================================
--- trunk/SdlDotNet/src/Input/Keyboard.cs	2007-05-18 21:37:04 UTC (rev 1383)
+++ trunk/SdlDotNet/src/Input/Keyboard.cs	2007-05-21 06:21:34 UTC (rev 1384)
@@ -1246,30 +1246,12 @@
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
+        [Obsolete("Instead, consider just casting your System.Int16 to System.Char, or using System.Char.ConvertFromUtf32()", false)]
         public static string UnicodeCharacter(short input)
         {
-            Encoding unicode;
-            unicode = Encoding.Unicode;
-            string hexString = Convert.ToString(input, 16);
-            string finalString = "";
-            if (hexString.Length >= 2)
-            {
-                finalString = Regex.Unescape(@"\x" + hexString);
-            }
+            return new string((char)input, 1);
+        } 
 
-            byte[] codes;
-            char[] chars = new char[0];
-            codes = unicode.GetBytes(finalString);
-            chars = unicode.GetChars(codes);
-            if (chars.Length > 0)
-            {
-                return chars[0].ToString();
-            }
-            else
-            {
-                return "";
-            }
-        }
 
         /// <summary>
         /// Checks key state

Modified: trunk/SdlDotNet/src/Input/KeyboardEventArgs.cs
===================================================================
--- trunk/SdlDotNet/src/Input/KeyboardEventArgs.cs	2007-05-18 21:37:04 UTC (rev 1383)
+++ trunk/SdlDotNet/src/Input/KeyboardEventArgs.cs	2007-05-21 06:21:34 UTC (rev 1384)
@@ -155,11 +155,11 @@
         /// <summary>
         /// Unicode Character
         /// </summary>
-        public string UnicodeCharacter
+        public char UnicodeCharacter
         {
             get
             {
-                return Keyboard.UnicodeCharacter(this.EventStruct.key.keysym.unicode);
+                return (char)this.EventStruct.key.keysym.unicode;
             }
         }
 

Modified: trunk/SdlDotNet/src/Windows/SurfaceControl.cs
===================================================================
--- trunk/SdlDotNet/src/Windows/SurfaceControl.cs	2007-05-18 21:37:04 UTC (rev 1383)
+++ trunk/SdlDotNet/src/Windows/SurfaceControl.cs	2007-05-21 06:21:34 UTC (rev 1384)
@@ -199,10 +199,10 @@
         {
             if (!this.DesignMode)
             {
-                if (e.Button != MouseButtons.None)
-                {
-                    SdlDotNet.Core.Events.Add(new MouseMotionEventArgs(true, SurfaceControl.ConvertMouseButtons(e), (short)e.X, (short)e.Y, (short)(e.X - lastX), (short)(e.Y - lastY)));
-                }
+                //if (e.Button != MouseButtons.None)
+                //{
+                SdlDotNet.Core.Events.Add(new MouseMotionEventArgs(true, SurfaceControl.ConvertMouseButtons(e), (short)e.X, (short)e.Y, (short)(e.X - lastX), (short)(e.Y - lastY)));
+                //}
                 lastX = e.X;
                 lastY = e.Y;
             }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.