From d134e182dc8aafd9b72f21972cdec17a85b0c7bc Mon Sep 17 00:00:00 2001 From: Geoff Norton Date: Mon, 4 Feb 2008 23:12:17 +0000 Subject: [PATCH] In System.Windows.Forms.CarbonInternal: * KeyboardHandler.cs: Filter the translate call. 2008-02-04 Geoff Norton * KeyboardHandler.cs: Commit support for the last batch of keytypes (F1-12; Fn+modifiers; etc). 2008-02-04 Geoff Norton svn path=/trunk/mcs/; revision=94812 --- .../System.Windows.Forms.CarbonInternal/ChangeLog | 4 ++++ .../System.Windows.Forms.CarbonInternal/KeyboardHandler.cs | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.CarbonInternal/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.CarbonInternal/ChangeLog index a91ba38f60d..8a8773cd8f1 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.CarbonInternal/ChangeLog +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.CarbonInternal/ChangeLog @@ -1,5 +1,9 @@ 2008-02-04 Geoff Norton + * KeyboardHandler.cs: Filter the translate call. + +2008-02-04 Geoff Norton + * KeyboardHandler.cs: Commit support for the last batch of keytypes (F1-12; Fn+modifiers; etc). diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.CarbonInternal/KeyboardHandler.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.CarbonInternal/KeyboardHandler.cs index 0a4e4f351b7..8f571b3e7d6 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.CarbonInternal/KeyboardHandler.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.CarbonInternal/KeyboardHandler.cs @@ -259,8 +259,10 @@ namespace System.Windows.Forms.CarbonInternal { if (msg.message >= Msg.WM_KEYFIRST && msg.message <= Msg.WM_KEYLAST) res = true; - + if (msg != Msg.WM_KEYDOWN && msg != Msg.WM_SYSKEYDOWN && msg != Msg.WM_KEYUP && msg != Msg.WM_SYSKEYUP && msg != Msg.WM_CHAR && msg != Msg.WM_SYSCHAR) + return res; + if (key_modifier_table [8] == 0x01 && key_modifier_table [12] == 0x00 && key_modifier_table [14] == 0x00) { if (msg.message == Msg.WM_KEYDOWN) { msg.message = Msg.WM_SYSKEYDOWN; -- 2.11.4.GIT