diff options
| author | Alexander Gramiak <agrambot@gmail.com> | 2019-04-13 09:40:03 -0600 |
|---|---|---|
| committer | Alexander Gramiak <agrambot@gmail.com> | 2019-04-26 16:54:17 -0600 |
| commit | a411517faf624657aa58979f5463115115093309 (patch) | |
| tree | bd75804dd99876f424c9e6805212e356683c54d4 /src/w32menu.c | |
| parent | da9541dd1086b7bab52940c82915efe114bb7419 (diff) | |
| download | emacs-a411517faf624657aa58979f5463115115093309.tar.gz emacs-a411517faf624657aa58979f5463115115093309.tar.bz2 emacs-a411517faf624657aa58979f5463115115093309.zip | |
Rename generic x_* identifiers
* src/image.c: Rename x_* procedures to image_*.
* src/frame.c: Rename x_* procedures to gui_*. Rename
xrdb_get_resource to gui_display_get_resource. Rename x_get_arg to
gui_display_get arg.
* src/frame.h: Rename can_x_set_window_size to can_set_window_size.
* src/xfaces.c: Rename realize_x_face to realize_gui_face. Rename
x_supports_face_attributes_p to gui_supports_face_attributes_p.
* src/keyboard.c:
* src/lisp.h:
* src/nsterm.m:
* src/w32term.c:
* src/xterm.c: Rename x_get_keysym_name to get_keysym_name.
* src/nsfns.c:
* src/nsterm.m: Rename x_* procedures to ns_*.
* src/w32fns.c:
* src/w32term.c: Rename x_* procedures to w32_*.
* src/termhooks.h (query_colors, get_focus_frame, focus_frame_hook)
(frame_visible_invisible_hook, iconify_frame_hook)
(set_window_size_hook, set_frame_offset_hook, set_frame_alpha_hook)
(set_new_font_hook, set_bitmap_icon_hook, implicit_set_name_hook)
(activate_menubar_hook, change_tool_bar_height_hook)
(set_scroll_bar_default_width_hook)
(set_scroll_bar_default_height_hook, get_string_resource_hook): New
terminal hooks to replace backend-specific x_* procedures.
* src/dispextern.h (clear_under_internal_border): New RIF procedure.
* src/alloc.c:
* src/frame.c:
* src/xdisp.c: Use FRAME_OUTPUT_DATA instead of FRAME_X_OUTPUT.
* src/frame.c:
* src/w32term.c:
* src/w32fns.c: Use FRAME_NATIVE_WINDOW instead of FRAME_X_WINDOW.
Diffstat (limited to 'src/w32menu.c')
| -rw-r--r-- | src/w32menu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/w32menu.c b/src/w32menu.c index 38e1b506e09..669161c408b 100644 --- a/src/w32menu.c +++ b/src/w32menu.c @@ -153,7 +153,7 @@ w32_popup_dialog (struct frame *f, Lisp_Object header, Lisp_Object contents) This way we can safely execute Lisp code. */ void -x_activate_menubar (struct frame *f) +w32_activate_menubar (struct frame *f) { set_frame_menubar (f, false, true); @@ -1469,7 +1469,7 @@ w32_menu_display_help (HWND owner, HMENU menu, UINT item, UINT flags) { if (get_menu_item_info) { - struct frame *f = x_window_to_frame (&one_w32_display_info, owner); + struct frame *f = w32_window_to_frame (&one_w32_display_info, owner); Lisp_Object frame, help; /* No help echo on owner-draw menu items, or when the keyboard |