aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Rudalics2014-01-29 11:29:14 +0100
committerMartin Rudalics2014-01-29 11:29:14 +0100
commit5442c6cebbf80898f83d211d5b0d34cbfb289490 (patch)
treeb9bb0c9e3aaf50c637902c38ac0109ec0ba4fc93 /src
parentb89878d380108dc479a03d1cf5bc5704ad33fbdf (diff)
downloademacs-5442c6cebbf80898f83d211d5b0d34cbfb289490.tar.gz
emacs-5442c6cebbf80898f83d211d5b0d34cbfb289490.zip
In x_set_tool_bar_lines of w32fns.c don't clear area on frames that are not visible.
* w32fns.c (x_set_tool_bar_lines): Don't clear area on frames that are not visible.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/w32fns.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 3634c088f7e..93711966775 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12014-01-29 Martin Rudalics <rudalics@gmx.at>
2
3 * w32fns.c (x_set_tool_bar_lines): Don't clear area on frames
4 that are not visible.
5
12014-01-29 Jan Djärv <jan.h.d@swipnet.se> 62014-01-29 Jan Djärv <jan.h.d@swipnet.se>
2 7
3 * xmenu.c (create_and_show_popup_menu): Handle case when no key 8 * xmenu.c (create_and_show_popup_menu): Handle case when no key
diff --git a/src/w32fns.c b/src/w32fns.c
index 8d64af5b93d..98456cd20d4 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -1713,7 +1713,7 @@ x_set_tool_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
1713 /* If the tool bar gets smaller, the internal border below it 1713 /* If the tool bar gets smaller, the internal border below it
1714 has to be cleared. It was formerly part of the display 1714 has to be cleared. It was formerly part of the display
1715 of the larger tool bar, and updating windows won't clear it. */ 1715 of the larger tool bar, and updating windows won't clear it. */
1716 if (FRAME_INTERNAL_BORDER_WIDTH (f) != 0) 1716 if (FRAME_INTERNAL_BORDER_WIDTH (f) != 0 && FRAME_VISIBLE_P (f))
1717 { 1717 {
1718 int height = FRAME_INTERNAL_BORDER_WIDTH (f); 1718 int height = FRAME_INTERNAL_BORDER_WIDTH (f);
1719 int width = FRAME_PIXEL_WIDTH (f); 1719 int width = FRAME_PIXEL_WIDTH (f);