From d76112a47afd7234f385cd4d73fac1566dfb5e2f Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Wed, 4 Nov 2015 10:24:50 +1100
Subject: [PATCH] CheckReturn should not be here.

---
 OpenTK/Platform/MacOS/CarbonBindings/CarbonAPI.cs | 7 +------
 OpenTK/Platform/MacOS/CarbonGLNative.cs           | 4 ++++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/OpenTK/Platform/MacOS/CarbonBindings/CarbonAPI.cs b/OpenTK/Platform/MacOS/CarbonBindings/CarbonAPI.cs
index fe9bf9d7d..567d9d1e7 100644
--- a/OpenTK/Platform/MacOS/CarbonBindings/CarbonAPI.cs
+++ b/OpenTK/Platform/MacOS/CarbonBindings/CarbonAPI.cs
@@ -490,11 +490,6 @@ namespace OpenTK.Platform.MacOS.Carbon
 		[DllImport(carbon)]
 		static extern void ReleaseEvent(IntPtr theEvent);
 
-		internal static void SendEvent(IntPtr theEvent) {
-			IntPtr theTarget = GetEventDispatcherTarget();
-			SendEventToEventTarget(theEvent, theTarget);
-		}
-
 		// Processes events in the queue and then returns.
 		internal static void ProcessEvents() {
 			IntPtr theEvent;
@@ -600,7 +595,7 @@ namespace OpenTK.Platform.MacOS.Carbon
 			OSStatus result = API.GetEventParameter(inEvent,
 			                                        EventParamName.WindowRef, EventParamType.typeWindowRef, IntPtr.Zero,
 			                                        sizeof(IntPtr), IntPtr.Zero, (IntPtr)(void*)&retval);
-			CheckReturn(result);
+			//CheckReturn(result);
 			windowRef = retval;
 			return result;
 		}
diff --git a/OpenTK/Platform/MacOS/CarbonGLNative.cs b/OpenTK/Platform/MacOS/CarbonGLNative.cs
index aff78e5d6..afdfde4bd 100644
--- a/OpenTK/Platform/MacOS/CarbonGLNative.cs
+++ b/OpenTK/Platform/MacOS/CarbonGLNative.cs
@@ -223,6 +223,10 @@ namespace OpenTK.Platform.MacOS {
 					GetCharCodes(inEvent, out code, out charCode);
 					keyPressArgs.KeyChar = charCode;
 					break;
+			}			
+			if( !Keymap.ContainsKey( code ) ) {
+				Debug.Print( "{0} is not mapped, ignoring" );
+				return OSStatus.NoError;
 			}
 
 			switch ((KeyboardEventKind)evt.EventKind) {