andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* nsmenu.m (update_frame_tool_bar): Remove NSLog on invalid image.

Browse source
This commit is contained in:
Jan Djärv 2010-12-02 10:33:57 +01:00
parent 9583e9a03c
commit dd723bbd42
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ChangeLog
View file

@ -1,5 +1,7 @@
2010-12-02 Jan Djärv <jan.h.d@swipnet.se>
* nsmenu.m (update_frame_tool_bar): Remove NSLog on invalid image.
* nsterm.m (ns_draw_glyph_string): Switch fore- and background if
drawing text under filled box cursor (Bug#7479).

12
src/nsmenu.m
View file

@ -1049,10 +1049,15 @@ update_frame_tool_bar (FRAME_PTR f)
{
idx = -1;
}
helpObj = TOOLPROP (TOOL_BAR_ITEM_HELP);
if (NILP (helpObj))
helpObj = TOOLPROP (TOOL_BAR_ITEM_CAPTION);
helpText = NILP (helpObj) ? "" : (char *)SDATA (helpObj);
/* Ignore invalid image specifications. */
if (!valid_image_p (image))
{
NSLog (@"Invalid image for toolbar item");
/* Don't log anything, GNUS makes invalid images all the time. */
continue;
}
@ -1066,11 +1071,6 @@ update_frame_tool_bar (FRAME_PTR f)
continue;
}
helpObj = TOOLPROP (TOOL_BAR_ITEM_HELP);
if (NILP (helpObj))
helpObj = TOOLPROP (TOOL_BAR_ITEM_CAPTION);
helpText = NILP (helpObj) ? "" : (char *)SDATA (helpObj);
[toolbar addDisplayItemWithImage: img->pixmap idx: i helpText: helpText
enabled: enabled_p];
#undef TOOLPROP