Permalink
Browse files

[X11] Rebased on develop branch

  • Loading branch information...
1 parent 7cce215 commit 692c4c64ff53cb4717b104e636d13513aeb63be0 @thefiddler thefiddler committed May 14, 2014
Showing with 3 additions and 5 deletions.
  1. +0 −1 Source/OpenTK/OpenTK.csproj
  2. +3 −4 Source/OpenTK/Platform/X11/X11KeyMap.cs
@@ -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">
@@ -1,6 +1,6 @@
-#region License
+#region License
//
-// Xkb.cs
+// X11KeyMap.cs
//
// Author:
// Stefanos Apostolopoulos <stapostol@gmail.com>
@@ -693,10 +693,9 @@ internal bool TranslateKey(int keycode, out Key key)
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;

0 comments on commit 692c4c6

Please sign in to comment.