From 64a79b5621a63914a2ba9ab00793dcf7fd58d8e0 Mon Sep 17 00:00:00 2001 From: Bertrand Lorentz Date: Thu, 28 Jun 2012 17:49:05 -0400 Subject: [PATCH] gdk: Re-enable code using Device.NumAxes As the Device.NumAxes is back now, we can re-enable the pieces of code that were disabled during the inital port. --- gdk/EventButton.cs | 4 ---- gdk/EventMotion.cs | 4 ---- 2 files changed, 8 deletions(-) diff --git a/gdk/EventButton.cs b/gdk/EventButton.cs index b7a2f2693..bdb19d470 100644 --- a/gdk/EventButton.cs +++ b/gdk/EventButton.cs @@ -50,21 +50,17 @@ namespace Gdk { public double[] Axes { get { double[] result = null; -#if FIXME30 IntPtr axes = Native.axes; if (axes != IntPtr.Zero) { result = new double [Device.NumAxes]; Marshal.Copy (axes, result, 0, result.Length); } -#endif return result; } set { NativeStruct native = Native; -#if FIXME30 if (native.axes == IntPtr.Zero || value.Length != Device.NumAxes) throw new InvalidOperationException (); -#endif Marshal.Copy (value, 0, native.axes, value.Length); } } diff --git a/gdk/EventMotion.cs b/gdk/EventMotion.cs index a631574d5..7b6dc9a7b 100644 --- a/gdk/EventMotion.cs +++ b/gdk/EventMotion.cs @@ -51,21 +51,17 @@ namespace Gdk { public double[] Axes { get { double[] result = null; -#if FIXME30 IntPtr axes = Native.axes; if (axes != IntPtr.Zero) { result = new double [Device.NumAxes]; Marshal.Copy (axes, result, 0, result.Length); } -#endif return result; } set { NativeStruct native = Native; -#if FIXME30 if (native.axes == IntPtr.Zero || value.Length != Device.NumAxes) throw new InvalidOperationException (); -#endif Marshal.Copy (value, 0, native.axes, value.Length); } }