summaryrefslogtreecommitdiff
path: root/src/w32fns.c
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2008-07-31 02:47:32 +0000
committerDan Nicolaescu <dann@ics.uci.edu>2008-07-31 02:47:32 +0000
commit12205281da02dc955c47fa1830bbd4daef835433 (patch)
tree1496b27a15674de3998143ee86c890e777b78c8f /src/w32fns.c
parentb41d4794f126c98d4f0a3a6921a611b022e5f33f (diff)
downloademacs-before-remove-vms.tar.gz
* s/ms-w32.h (MULTI_KBOARD): Remove.before-remove-vms
* xterm.c: * xselect.c: * xfns.c: * window.c: * w32term.c: * w32fns.c: * terminal.c: * termhooks.h: * term.c: * sysdep.c: * keyboard.h: * keyboard.c: * frame.h: * frame.c: * frame.c: Remove references to MULTI_KBOARD, it is now the default. * config.in: Regenerate. * config.nt (MULTI_KBOARD): Remove. * configure.in (MULTI_KBOARD): Remove.
Diffstat (limited to 'src/w32fns.c')
-rw-r--r--src/w32fns.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/w32fns.c b/src/w32fns.c
index a12c349e4ca..2fb03114007 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -4290,11 +4290,7 @@ This function is an internal primitive--use `make-frame' instead. */)
if (EQ (display, Qunbound))
display = Qnil;
dpyinfo = check_x_display_info (display);
-#ifdef MULTI_KBOARD
kb = dpyinfo->terminal->kboard;
-#else
- kb = &the_only_kboard;
-#endif
if (!dpyinfo->terminal->name)
error ("Terminal is not live, can't create new frames on it");
@@ -5411,11 +5407,7 @@ x_create_tip_frame (dpyinfo, parms, text)
this frame has a specified name. */
Vx_resource_name = Vinvocation_name;
-#ifdef MULTI_KBOARD
kb = dpyinfo->terminal->kboard;
-#else
- kb = &the_only_kboard;
-#endif
/* Get the name of the frame to use for resource lookup. */
name = x_get_arg (dpyinfo, parms, Qname, "name", "Name", RES_TYPE_STRING);
@@ -5464,9 +5456,7 @@ x_create_tip_frame (dpyinfo, parms, text)
image_cache_refcount = FRAME_IMAGE_CACHE (f)->refcount;
dpyinfo_refcount = dpyinfo->reference_count;
#endif /* GLYPH_DEBUG */
-#ifdef MULTI_KBOARD
FRAME_KBOARD (f) = kb;
-#endif
f->output_data.w32->parent_desc = FRAME_W32_DISPLAY_INFO (f)->root_window;
f->output_data.w32->explicit_parent = 0;