From 2dc8b986833d0f03026dd91549ef39908d380b54 Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Tue, 15 May 2007 23:01:38 +0000 Subject: [PATCH] (x_set_tool_bar_lines): Don't use updating_frame. (Fx_create_frame): Set terminal and ref count. (Fx_open_connection): Remove window-system check. --- src/w32fns.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/w32fns.c b/src/w32fns.c index 8cac4ea2376..89637284a39 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -1816,10 +1816,8 @@ x_set_tool_bar_lines (f, value, oldval) below the menu bar. */ if (FRAME_W32_WINDOW (f) && FRAME_TOOL_BAR_LINES (f) == 0) { - updating_frame = f; - clear_frame (); + clear_frame (f); clear_current_matrices (f); - updating_frame = NULL; } /* If the tool bar gets smaller, the internal border below it @@ -4215,6 +4213,9 @@ This function is an internal primitive--use `make-frame' instead. */) /* By default, make scrollbars the system standard width. */ FRAME_CONFIG_SCROLL_BAR_WIDTH (f) = GetSystemMetrics (SM_CXVSCROLL); + f->terminal = dpyinfo->terminal; + f->terminal->reference_count++; + f->output_method = output_w32; f->output_data.w32 = (struct w32_output *) xmalloc (sizeof (struct w32_output)); @@ -6703,8 +6704,10 @@ terminate Emacs if we can't open the connection. */) if (! NILP (xrm_string)) CHECK_STRING (xrm_string); +#if 0 if (! EQ (Vwindow_system, intern ("w32"))) error ("Not using Microsoft Windows"); +#endif /* Allow color mapping to be defined externally; first look in user's HOME directory, then in Emacs etc dir for a file called rgb.txt. */ -- 2.39.5