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

diff --git a/src/ChangeLog b/src/ChangeLog
index a09b0b2606e07dfb940599eb66b1494d4b764e93..425a30a62f710f0f1849c99cea250249a3828d66 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 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.

diff --git a/src/w32fns.c b/src/w32fns.c
index 319f8d95573238ffa8941228f1d9384d303093dd..4b12861c44b42e6f5e8f84c67f13c83b20dd2685 100644 (file)
--- 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,