From d71efc2b7cfdb679b0c5a45bfaba33208a53dcc2 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Wed, 4 Nov 2015 09:47:49 +1100 Subject: [PATCH] These methods shouldn't use CheckResult as they have a special case for EventParamaterNotFound. --- OpenTK/Platform/MacOS/CarbonBindings/CarbonAPI.cs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/OpenTK/Platform/MacOS/CarbonBindings/CarbonAPI.cs b/OpenTK/Platform/MacOS/CarbonBindings/CarbonAPI.cs index bb8c7b3fc..fe9bf9d7d 100644 --- a/OpenTK/Platform/MacOS/CarbonBindings/CarbonAPI.cs +++ b/OpenTK/Platform/MacOS/CarbonBindings/CarbonAPI.cs @@ -572,9 +572,7 @@ namespace OpenTK.Platform.MacOS.Carbon OSStatus result = API.GetEventParameter(inEvent, EventParamName.MouseButton, EventParamType.typeMouseButton, IntPtr.Zero, sizeof(short), IntPtr.Zero, (IntPtr)(void*)&button); - - if (result != OSStatus.NoError) - throw new MacOSException(result); + CheckReturn(result); return (MacOSMouseButton)button; } @@ -583,9 +581,7 @@ namespace OpenTK.Platform.MacOS.Carbon OSStatus result = API.GetEventParameter(inEvent, EventParamName.MouseWheelDelta, EventParamType.typeSInt32, IntPtr.Zero, sizeof(int), IntPtr.Zero, (IntPtr)(void*)&delta); - - if (result != OSStatus.NoError) - throw new MacOSException(result); + CheckReturn(result); return delta; } @@ -594,7 +590,7 @@ namespace OpenTK.Platform.MacOS.Carbon OSStatus result = API.GetEventParameter(inEvent, EventParamName.WindowMouseLocation, EventParamType.typeHIPoint, IntPtr.Zero, Marshal.SizeOf(typeof(HIPoint)), IntPtr.Zero, (IntPtr)(void*)&point); - CheckReturn(result); + //CheckReturn(result); pt = point; return result; } @@ -614,7 +610,7 @@ namespace OpenTK.Platform.MacOS.Carbon OSStatus result = API.GetEventParameter(inEvent, EventParamName.MouseLocation, EventParamType.typeHIPoint, IntPtr.Zero, Marshal.SizeOf(typeof(HIPoint)), IntPtr.Zero, (IntPtr)(void*)&point); - CheckReturn(result); + //CheckReturn(result); pt = point; return result; }