1 files changed, 32 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9169ddc7fe4..c69c37ce504 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,35 @@
+2002-08-03  Andrew Choi  <akochoi@shaw.ca>
+
+        * macterm.c (USE_CARBON_EVENTS): New macro.
+        (macCtrlKey, macShiftKey, macMetaKey, macAltKey): New macros.
+        (x_iconify_frame): Call CollapseWindow.
+        (Vmac_reverse_ctrl_meta): New variable.
+        (Vmac_wheel_button_is_mouse_2): New variable.
+        (init_mac_drag_n_drop): New function.
+        (mac_do_receive_drag): New function.
+        (mac_handle_service_event): New function.
+        (init_service_handler): New function.
+        (mac_to_emacs_modifiers): New function.
+        (mac_event_to_emacs_modifiers): New function.
+        (mac_get_mouse_btn): New function.
+        (mac_convert_event_ref): New function.
+        (XTread_socket) [USE_CARBON_EVENTS]: Call ReceiveNextEvent,
+        SendEventToEventTarget, mac_event_to_emacs_modifiers, and
+        mac_get_mouse_btn.
+        (mac_initialize): Call init_mac_drag_n_drop and
+        init_service_handler.
+
+        * keyboard.c: Define Qmouse_wheel, mouse_wheel_syms, and
+        lispy_mouse_wheel_names for MAC_OSX as well as for WINDOWS_NT.
+        (kbd_buffer_get_event): Set used_mouse_menu for MENU_BAR_EVENT and
+        TOOL_BAR_EVENT for MAC_OS as well.
+        (make_lispy_event): Handle MOUSE_WHEEL_EVENT for MAC_OSX as well
+        as for WINDOWS_NT.
+        (syms_of_keyboard): Initialize Qmouse_wheel for MAC_OSX.
+
+        * termhooks.h (event_kind): Define MOUSE_WHEEL_EVENT also for
+        MAC_OSX.
+        
 2002-08-03  Gerd Moellmann  <gerd.moellmann@t-online.de>
 
         * xdisp.c (forward_to_next_line_start): Fix a condition that