Commit a019c41a authored by YAMAMOTO Mitsuharu's avatar YAMAMOTO Mitsuharu
Browse files

(mac_update_title_bar): Add extern.

(struct mac_output) [TARGET_API_MAC_CARBON]: New member `file_name'.
(FRAME_FILE_NAME): New macro.
parent 458dbb8c
...@@ -335,6 +335,11 @@ struct mac_output { ...@@ -335,6 +335,11 @@ struct mac_output {
/* Hints for the size and the position of a window. */ /* Hints for the size and the position of a window. */
XSizeHints *size_hints; 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 #if USE_CG_DRAWING
/* Quartz 2D graphics context. */ /* Quartz 2D graphics context. */
CGContextRef cg_context; CGContextRef cg_context;
...@@ -360,6 +365,8 @@ typedef struct mac_output mac_output; ...@@ -360,6 +365,8 @@ typedef struct mac_output mac_output;
#define FRAME_SIZE_HINTS(f) ((f)->output_data.mac->size_hints) #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. */ /* 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_MAC_DISPLAY_INFO(f) (&one_mac_display_info)
#define FRAME_X_DISPLAY_INFO(f) (&one_mac_display_info) #define FRAME_X_DISPLAY_INFO(f) (&one_mac_display_info)
...@@ -606,6 +613,7 @@ extern int x_char_width P_ ((struct frame *)); ...@@ -606,6 +613,7 @@ extern int x_char_width P_ ((struct frame *));
extern int x_char_height P_ ((struct frame *)); extern int x_char_height P_ ((struct frame *));
extern void x_sync P_ ((struct frame *)); extern void x_sync P_ ((struct frame *));
extern void x_set_tool_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object)); extern void x_set_tool_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object));
extern void mac_update_title_bar P_ ((struct frame *, int));
/* Defined in macmenu.c */ /* Defined in macmenu.c */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment