(Fx_create_frame): Enable tool-bar when images are supported.

d3109773 · Jason Rumney · b8b47c19 · d3109773 · d3109773
Commit d3109773 authored Mar 22, 2002 by Jason Rumney
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

src/ChangeLog src/ChangeLog +3 -0

src/w32fns.c src/w32fns.c +6 -1

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
 2002-03-22  Jason Rumney  <jasonr@gnu.org>

+	* w32fns.c (Fx_create_frame): Enable tool-bar when images are
+	supported.
+
 	* w32term.c: (zv_bits): Declare as short, for word alignment.
 	(w32_read_socket) <WM_XBUTTONUP>: Fix last change.
 	(syms_of_w32term): Define x-use-underline-position-properties.

--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -5677,8 +5677,13 @@ This function is an internal primitive--use `make-frame' instead.  */)
  
  x_default_parameter (f, parms, Qmenu_bar_lines, make_number (1),
 		       "menuBar", "MenuBar", RES_TYPE_NUMBER);
-  x_default_parameter (f, parms, Qtool_bar_lines, make_number (HAVE_IMAGES),
+#ifdef HAVE_IMAGES
+  x_default_parameter (f, parms, Qtool_bar_lines, make_number (1),
+                       "toolBar", "ToolBar", RES_TYPE_NUMBER);
+#else
+  x_default_parameter (f, parms, Qtool_bar_lines, make_number (0),
                       "toolBar", "ToolBar", RES_TYPE_NUMBER);
+#endif
  x_default_parameter (f, parms, Qbuffer_predicate, Qnil,
 		       "bufferPredicate", "BufferPredicate", RES_TYPE_SYMBOL);
  x_default_parameter (f, parms, Qtitle, Qnil,