diff options
| author | Jason Rumney | 2002-03-22 22:46:29 +0000 |
|---|---|---|
| committer | Jason Rumney | 2002-03-22 22:46:29 +0000 |
| commit | d31097738a6b156f6ddcb3b797304a08cbb49d8e (patch) | |
| tree | ac05b13a9100f6088e4024afdd5539f677883ce0 /src | |
| parent | b8b47c1966c36a9bfa25ccc2c5b9ff5c7dd762d1 (diff) | |
| download | emacs-d31097738a6b156f6ddcb3b797304a08cbb49d8e.tar.gz emacs-d31097738a6b156f6ddcb3b797304a08cbb49d8e.zip | |
(Fx_create_frame): Enable tool-bar when images are supported.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/w32fns.c | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a09b0b2606e..425a30a62f7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2002-03-22 Jason Rumney <jasonr@gnu.org> | 1 | 2002-03-22 Jason Rumney <jasonr@gnu.org> |
| 2 | 2 | ||
| 3 | * w32fns.c (Fx_create_frame): Enable tool-bar when images are | ||
| 4 | supported. | ||
| 5 | |||
| 3 | * w32term.c: (zv_bits): Declare as short, for word alignment. | 6 | * w32term.c: (zv_bits): Declare as short, for word alignment. |
| 4 | (w32_read_socket) <WM_XBUTTONUP>: Fix last change. | 7 | (w32_read_socket) <WM_XBUTTONUP>: Fix last change. |
| 5 | (syms_of_w32term): Define x-use-underline-position-properties. | 8 | (syms_of_w32term): Define x-use-underline-position-properties. |
diff --git a/src/w32fns.c b/src/w32fns.c index 319f8d95573..4b12861c44b 100644 --- a/src/w32fns.c +++ b/src/w32fns.c | |||
| @@ -5677,8 +5677,13 @@ This function is an internal primitive--use `make-frame' instead. */) | |||
| 5677 | 5677 | ||
| 5678 | x_default_parameter (f, parms, Qmenu_bar_lines, make_number (1), | 5678 | x_default_parameter (f, parms, Qmenu_bar_lines, make_number (1), |
| 5679 | "menuBar", "MenuBar", RES_TYPE_NUMBER); | 5679 | "menuBar", "MenuBar", RES_TYPE_NUMBER); |
| 5680 | x_default_parameter (f, parms, Qtool_bar_lines, make_number (HAVE_IMAGES), | 5680 | #ifdef HAVE_IMAGES |
| 5681 | x_default_parameter (f, parms, Qtool_bar_lines, make_number (1), | ||
| 5682 | "toolBar", "ToolBar", RES_TYPE_NUMBER); | ||
| 5683 | #else | ||
| 5684 | x_default_parameter (f, parms, Qtool_bar_lines, make_number (0), | ||
| 5681 | "toolBar", "ToolBar", RES_TYPE_NUMBER); | 5685 | "toolBar", "ToolBar", RES_TYPE_NUMBER); |
| 5686 | #endif | ||
| 5682 | x_default_parameter (f, parms, Qbuffer_predicate, Qnil, | 5687 | x_default_parameter (f, parms, Qbuffer_predicate, Qnil, |
| 5683 | "bufferPredicate", "BufferPredicate", RES_TYPE_SYMBOL); | 5688 | "bufferPredicate", "BufferPredicate", RES_TYPE_SYMBOL); |
| 5684 | x_default_parameter (f, parms, Qtitle, Qnil, | 5689 | x_default_parameter (f, parms, Qtitle, Qnil, |