Mercurial > emacs
changeset 111785:722e83b4c563
* nsmenu.m (update_frame_tool_bar): Remove NSLog on invalid image.
| author | Jan D. <jan.h.d@swipnet.se> |
|---|---|
| date | Thu, 02 Dec 2010 10:33:57 +0100 |
| parents | df9e4ed95f9b |
| children | 1441c8ae52a0 |
| files | src/ChangeLog src/nsmenu.m |
| diffstat | 2 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Dec 02 09:24:16 2010 +0100 +++ b/src/ChangeLog Thu Dec 02 10:33:57 2010 +0100 @@ -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).
--- a/src/nsmenu.m Thu Dec 02 09:24:16 2010 +0100 +++ b/src/nsmenu.m Thu Dec 02 10:33:57 2010 +0100 @@ -1049,10 +1049,15 @@ { 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 @@ 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