comparison src/keyboard.c @ 112434:9de5a68b57e1

Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.

112433:7b649f6eac4f

  if (!have_label)
    {
      /* Try to make one from caption and key.  */
      Lisp_Object key = PROP (TOOL_BAR_ITEM_KEY);
      Lisp_Object capt = PROP (TOOL_BAR_ITEM_CAPTION);
      const char *label = SYMBOLP (key) ? (char *) SDATA (SYMBOL_NAME (key)) : "";
      const char *caption = STRINGP (capt) ? (char *) SDATA (capt) : "";
      EMACS_INT max_lbl = 2 * tool_bar_max_label_size;
      char *buf = (char *) xmalloc (max_lbl + 1);
      Lisp_Object new_lbl;
      size_t caption_len = strlen (caption);

	mark_object (event->frame_or_window);
	mark_object (event->arg);
      }
  }
}

112434:9de5a68b57e1

  if (!have_label)
    {
      /* Try to make one from caption and key.  */
      Lisp_Object key = PROP (TOOL_BAR_ITEM_KEY);
      Lisp_Object capt = PROP (TOOL_BAR_ITEM_CAPTION);
      const char *label = SYMBOLP (key) ? SSDATA (SYMBOL_NAME (key)) : "";
      const char *caption = STRINGP (capt) ? SSDATA (capt) : "";
      EMACS_INT max_lbl = 2 * tool_bar_max_label_size;
      char *buf = (char *) xmalloc (max_lbl + 1);
      Lisp_Object new_lbl;
      size_t caption_len = strlen (caption);

	mark_object (event->frame_or_window);
	mark_object (event->arg);
      }
  }
}