Mercurial > emacs
changeset 83571:ca1c27e2707e
(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.
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Tue, 15 May 2007 23:01:38 +0000 |
| parents | c6328b40e293 |
| children | 244d6216c056 |
| files | src/w32fns.c |
| diffstat | 1 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/w32fns.c Tue May 15 22:59:34 2007 +0000 +++ b/src/w32fns.c Tue May 15 23:01:38 2007 +0000 @@ -1816,10 +1816,8 @@ 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 @@ /* 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 @@ 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. */