Merge pull request #498 from Unroll-Me/master

[mono.git] / mcs / class / Managed.Windows.Forms / System.Windows.Forms.CarbonInternal / EventHandler.cs

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.CarbonInternal/EventHandler.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.CarbonInternal/EventHandler.cs
index 80028d96e35aaddef5ee2b8d026ace97310faccd..6d9eb696d43c95764a05bfa43c9182ebbe713302 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.CarbonInternal/EventHandler.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.CarbonInternal/EventHandler.cs
@@ -81,20 +81,27 @@ namespace System.Windows.Forms.CarbonInternal {
                                                                        new EventTypeSpec (kEventClassMouse, MouseHandler.kEventMouseDragged),
                                                                        new EventTypeSpec (kEventClassMouse, MouseHandler.kEventMouseDown),
                                                                        new EventTypeSpec (kEventClassMouse, MouseHandler.kEventMouseUp),
+                                                                       new EventTypeSpec (kEventClassMouse, MouseHandler.kEventMouseWheelMoved),
+                                                                       new EventTypeSpec (kEventClassMouse, MouseHandler.kEventMouseScroll),
 
                                                                        new EventTypeSpec (kEventClassWindow, WindowHandler.kEventWindowDeactivated),
                                                                        new EventTypeSpec (kEventClassWindow, WindowHandler.kEventWindowActivated),
                                                                        new EventTypeSpec (kEventClassWindow, WindowHandler.kEventWindowDeactivated),
+                                                                       new EventTypeSpec (kEventClassWindow, WindowHandler.kEventWindowCollapsed),
                                                                        new EventTypeSpec (kEventClassWindow, WindowHandler.kEventWindowCollapsing),
+                                                                       new EventTypeSpec (kEventClassWindow, WindowHandler.kEventWindowExpanded),
                                                                        new EventTypeSpec (kEventClassWindow, WindowHandler.kEventWindowExpanding),
                                                                        new EventTypeSpec (kEventClassWindow, WindowHandler.kEventWindowBoundsChanged),
+                                                                       new EventTypeSpec (kEventClassWindow, WindowHandler.kEventWindowResizeStarted),
+                                                                       new EventTypeSpec (kEventClassWindow, WindowHandler.kEventWindowResizeCompleted),
                                                                        new EventTypeSpec (kEventClassWindow, WindowHandler.kEventWindowClose),
                                                                        new EventTypeSpec (kEventClassWindow, WindowHandler.kEventWindowShown),
 
                                                                        new EventTypeSpec (kEventClassKeyboard, KeyboardHandler.kEventRawKeyModifiersChanged),
                                                                        new EventTypeSpec (kEventClassKeyboard, KeyboardHandler.kEventRawKeyDown),
                                                                        new EventTypeSpec (kEventClassKeyboard, KeyboardHandler.kEventRawKeyRepeat),
-                                                                       new EventTypeSpec (kEventClassKeyboard, KeyboardHandler.kEventRawKeyUp)
+                                                                       new EventTypeSpec (kEventClassKeyboard, KeyboardHandler.kEventRawKeyUp),
+                                                                       new EventTypeSpec (kEventClassTextInput, KeyboardHandler.kEventTextInputUnicodeForKeyEvent)
                                                                        };
 
                internal static int EventCallback (IntPtr callref, IntPtr eventref, IntPtr handle) {
@@ -109,6 +116,7 @@ namespace System.Windows.Forms.CarbonInternal {
                                        break;
                                }
                                case kEventClassKeyboard:
+                               case kEventClassTextInput:
                                        handler = (IEventHandler) Driver.KeyboardHandler;
                                        break;
                                case kEventClassWindow:
@@ -137,13 +145,13 @@ namespace System.Windows.Forms.CarbonInternal {
 
                internal static bool TranslateMessage (ref MSG msg) {
                        bool result = false;
-
+ 
                        if (!result)
                                result = Driver.KeyboardHandler.TranslateMessage (ref msg);
                        if (!result)
                                result = Driver.MouseHandler.TranslateMessage (ref msg);
 
-                       return result;
+                       return result;
                }
 
                internal static void InstallApplicationHandler () {
@@ -166,7 +174,7 @@ namespace System.Windows.Forms.CarbonInternal {
                internal static extern IntPtr GetWindowEventTarget (IntPtr window);
 
                [DllImport ("/System/Library/Frameworks/Carbon.framework/Versions/Current/Carbon")]
-               static extern uint GetEventClass (IntPtr eventref);
+               internal static extern uint GetEventClass (IntPtr eventref);
                [DllImport ("/System/Library/Frameworks/Carbon.framework/Versions/Current/Carbon")]
                static extern uint GetEventKind (IntPtr eventref);