[X11] Rebased on develop branch

diff --git a/Source/OpenTK/OpenTK.csproj b/Source/OpenTK/OpenTK.csproj
index 2824d67..a6b037f 100644 (file)
--- a/Source/OpenTK/OpenTK.csproj
+++ b/Source/OpenTK/OpenTK.csproj
@@ -790,7 +790,6 @@
     <Compile Include="WindowIcon.cs" />
     <Compile Include="Platform\MacOS\Cocoa\NSBitmapFormat.cs" />
     <Compile Include="Platform\NativeWindowBase.cs" />
-    <Compile Include="Input\MouseScrollWheel.cs" />
     <Compile Include="Input\MouseEventArgs.cs" />
     <Compile Include="Platform\MacOS\Quartz\EventServices.cs" />
     <Compile Include="Platform\MacOS\Quartz\DisplayServices.cs">

diff --git a/Source/OpenTK/Platform/X11/X11KeyMap.cs b/Source/OpenTK/Platform/X11/X11KeyMap.cs
index 9d3b3d4..39e88a2 100644 (file)
--- a/Source/OpenTK/Platform/X11/X11KeyMap.cs
+++ b/Source/OpenTK/Platform/X11/X11KeyMap.cs
@@ -1,6 +1,6 @@
-#region License
+#region License
 //
-// Xkb.cs
+// X11KeyMap.cs
 //
 // Author:
 //       Stefanos Apostolopoulos <stapostol@gmail.com>
@@ -693,10 +693,9 @@ namespace OpenTK.Platform.X11
         internal bool TranslateKey(ref XKeyEvent e, out Key key)
         {
             return TranslateKey(e.keycode, out key);
-
         }
 
-        internal static MouseButton TranslateButton(int button, out int wheelx, out int wheely)
+        internal static MouseButton TranslateButton(int button, out float wheelx, out float wheely)
         {
             wheelx = 0;
             wheely = 0;