diff options
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2006-08-27 07:10:03 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2006-08-27 07:10:03 +0000 |
| commit | b2aad248ba4625b6f3ca7b7e36f7e0d25fed8b7b (patch) | |
| tree | 1f4e80b4d53317d7d8ed44e3fa0202efd3128cea /src | |
| parent | 3e7424f76a790845e4972f77e936264d631cb706 (diff) | |
| download | emacs-b2aad248ba4625b6f3ca7b7e36f7e0d25fed8b7b.tar.gz emacs-b2aad248ba4625b6f3ca7b7e36f7e0d25fed8b7b.tar.bz2 emacs-b2aad248ba4625b6f3ca7b7e36f7e0d25fed8b7b.zip | |
(struct mac_output) [TARGET_API_MAC_CARBON]: Remove member
file_name.
(FRAME_FILE_NAME): Remove macro.
(install_window_handler, create_apple_event_from_event_ref):
Return OSStatus instead of OSErr.
Diffstat (limited to 'src')
| -rw-r--r-- | src/macterm.h | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/macterm.h b/src/macterm.h index 55bf583c214..945dbf3af57 100644 --- a/src/macterm.h +++ b/src/macterm.h @@ -335,11 +335,6 @@ struct mac_output { /* Hints for the size and the position of a window. */ XSizeHints *size_hints; -#if TARGET_API_MAC_CARBON - /* File name for the proxy icon of this frame. Might be NULL. */ - char *file_name; -#endif - #if USE_CG_DRAWING /* Quartz 2D graphics context. */ CGContextRef cg_context; @@ -365,8 +360,6 @@ typedef struct mac_output mac_output; #define FRAME_SIZE_HINTS(f) ((f)->output_data.mac->size_hints) -#define FRAME_FILE_NAME(f) ((f)->output_data.mac->file_name) - /* This gives the mac_display_info structure for the display F is on. */ #define FRAME_MAC_DISPLAY_INFO(f) (&one_mac_display_info) #define FRAME_X_DISPLAY_INFO(f) (&one_mac_display_info) @@ -634,7 +627,7 @@ extern void mac_unload_font P_ ((struct mac_display_info *, XFontStruct *)); extern int mac_font_panel_visible_p P_ ((void)); extern OSStatus mac_show_hide_font_panel P_ ((void)); extern OSStatus mac_set_font_info_for_selection P_ ((struct frame *, int, int)); -extern OSErr install_window_handler P_ ((WindowPtr)); +extern OSStatus install_window_handler P_ ((WindowPtr)); extern void remove_window_handler P_ ((WindowPtr)); extern void do_menu_choice P_ ((SInt32)); extern OSStatus mac_post_mouse_moved_event P_ ((void)); @@ -675,10 +668,10 @@ extern void mac_clear_font_name_table P_ ((void)); extern Lisp_Object mac_aedesc_to_lisp P_ ((const AEDesc *)); extern OSErr mac_ae_put_lisp P_ ((AEDescList *, UInt32, Lisp_Object)); #if TARGET_API_MAC_CARBON -extern OSErr create_apple_event_from_event_ref P_ ((EventRef, UInt32, - EventParamName *, - EventParamType *, - AppleEvent *)); +extern OSStatus create_apple_event_from_event_ref P_ ((EventRef, UInt32, + EventParamName *, + EventParamType *, + AppleEvent *)); extern OSErr create_apple_event_from_drag_ref P_ ((DragRef, UInt32, FlavorType *, AppleEvent *)); |