*** empty log message ***

1 files changed, 55 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1e8aed6a54f..1702092aa1d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,58 @@
+2005-03-04  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * emacs.c (main): Change `#ifdef HAVE_CARBON' to `#if
+        defined (MAC_OSX) && defined (HAVE_CARBON)'.
+        
+        * image.c [!MAC_OSX && TARGET_API_MAC_CARBON]: Include
+        QuickTime.h.
+
+        * mac.c [!MAC_OSX && HAVE_CARBON]: Include Carbon.h.
+        [!MAC_OSX] (select) [TARGET_API_MAC_CARBON]: Use ReceiveNextEvent.
+        (posix_pathname_to_fsspec, fsspec_to_posix_pathname): New
+        functions.
+        (mac_clear_font_name_table): Move extern to macterm.h.
+
+        * macfns.c (install_window_handler): Move extern to macterm.h.
+        (Fx_file_dialog): Check STRINGP (default_filename) to see it is
+        valid.  Don't check !NILP (dir) because it is already checked with
+        CHECK_STRING.
+        (Fx_file_dialog) [!MAC_OSX]: Use FSSpec instead of FSRef for
+        specifying the default location and obtaining the selected
+        filename.
+
+        * macgui.h [!MAC_OSX && HAVE_CARBON]: Include Carbon.h.
+
+        * macmenu.h [TARGET_API_MAC_CARBON]: Don't include headers that
+        are included via Carbon.h.
+
+        * macterm.c [TARGET_API_MAC_CARBON && !MAC_OSX]: Define
+        USE_CARBON_EVENTS to 1.
+        [__MRC__ && TARGET_API_MAC_CARBON]: Don't declare `qd'.
+        (x_free_frame_resources): Call remove_window_handler for
+        non-tooltip windows.
+        [TARGET_API_MAC_CARBON]: Don't include headers that are included
+        via Carbon.h.
+        [TARGET_API_MAC_CARBON] (mac_do_track_dragUPP)
+        (mac_do_receive_dragUPP): New variables.
+        (mac_handle_service_event, init_service_handler): Put declarations
+        and definitions in #ifdef MAC_OSX.
+        (install_window_handler) [TARGET_API_MAC_CARBON]: Create UPPs for
+        drag-and-drop handler functions and register them.
+        (remove_window_handler): New function.
+        (do_ae_open_documents, mac_do_receive_drag) [!MAC_OSX]: Use
+        fsspec_to_posix_pathname.
+        (main): Change #if !TARGET_API_MAC_CARBON to #ifdef MAC_OS8.
+        (XTread_socket) [!MAC_OSX]: Don't pass keyboard events to TSM.
+        [MAC_OS8] (make_mac_terminal_frame) [TARGET_API_MAC_CARBON]: Set
+        default cursors.
+        (mac_initialize) [USE_CARBON_EVENTS && !MAC_OSX] : Don't call
+        init_service_handler or init_quit_char_handler.
+        (mac_initialize) [!MAC_OSX]: Don't call MakeMeTheFrontProcess.
+
+        * macterm.h (install_window_handler, remove_window_handler)
+        (posix_pathname_to_fsspec, fsspec_to_posix_pathname)
+        (mac_clear_font_name_table): New externs.
+        
 2005-03-03  Thien-Thi Nguyen  <ttn@gnu.org>
 
         * fileio.c (FILE_SYSTEM_CASE): Define macro if not already defined.