HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
[bpt/emacs.git]
/
src
/
nsmenu.m
diff --git
a/src/nsmenu.m
b/src/nsmenu.m
index
fb40284
..
44621f0
100644
(file)
--- a/
src/nsmenu.m
+++ b/
src/nsmenu.m
@@
-355,7
+355,7
@@
ns_update_menubar (struct frame *f, int deep_p, EmacsMenu *submenu)
/* if (submenu && strcmp (submenuTitle, SDATA (string)))
continue; */
/* if (submenu && strcmp (submenuTitle, SDATA (string)))
continue; */
- wv->name =
(char *)
SDATA (string);
+ wv->name =
S
SDATA (string);
update_submenu_strings (wv->contents);
wv = wv->next;
}
update_submenu_strings (wv->contents);
wv = wv->next;
}
@@
-444,7
+444,7
@@
ns_update_menubar (struct frame *f, int deep_p, EmacsMenu *submenu)
strncpy (previous_strings[i/4], SDATA (string), 10);
wv = xmalloc_widget_value ();
strncpy (previous_strings[i/4], SDATA (string), 10);
wv = xmalloc_widget_value ();
- wv->name =
(char *)
SDATA (string);
+ wv->name =
S
SDATA (string);
wv->value = 0;
wv->enabled = 1;
wv->button_type = BUTTON_TYPE_NONE;
wv->value = 0;
wv->enabled = 1;
wv->button_type = BUTTON_TYPE_NONE;
@@
-833,7
+833,7
@@
ns_menu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
}
#endif
pane_string = (NILP (pane_name)
}
#endif
pane_string = (NILP (pane_name)
- ? "" :
(char *)
SDATA (pane_name));
+ ? "" :
S
SDATA (pane_name));
/* If there is just one top-level pane, put all its items directly
under the top-level menu. */
if (menu_items_n_panes == 1)
/* If there is just one top-level pane, put all its items directly
under the top-level menu. */
if (menu_items_n_panes == 1)
@@
-898,9
+898,9
@@
ns_menu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
prev_wv->next = wv;
else
save_wv->contents = wv;
prev_wv->next = wv;
else
save_wv->contents = wv;
- wv->name =
(char *)
SDATA (item_name);
+ wv->name =
S
SDATA (item_name);
if (!NILP (descrip))
if (!NILP (descrip))
- wv->key =
(char *)
SDATA (descrip);
+ wv->key =
S
SDATA (descrip);
wv->value = 0;
/* If this item has a null value,
make the call_data null so that it won't display a box
wv->value = 0;
/* If this item has a null value,
make the call_data null so that it won't display a box
@@
-949,7
+949,7
@@
ns_menu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
title = ENCODE_MENU_STRING (title);
#endif
title = ENCODE_MENU_STRING (title);
#endif
- wv_title->name =
(char *)
SDATA (title);
+ wv_title->name =
S
SDATA (title);
wv_title->enabled = NO;
wv_title->button_type = BUTTON_TYPE_NONE;
wv_title->help = Qnil;
wv_title->enabled = NO;
wv_title->button_type = BUTTON_TYPE_NONE;
wv_title->help = Qnil;
@@
-1036,7
+1036,7
@@
update_frame_tool_bar (FRAME_PTR f)
helpObj = TOOLPROP (TOOL_BAR_ITEM_HELP);
if (NILP (helpObj))
helpObj = TOOLPROP (TOOL_BAR_ITEM_CAPTION);
helpObj = TOOLPROP (TOOL_BAR_ITEM_HELP);
if (NILP (helpObj))
helpObj = TOOLPROP (TOOL_BAR_ITEM_CAPTION);
- helpText = NILP (helpObj) ? "" :
(char *)
SDATA (helpObj);
+ helpText = NILP (helpObj) ? "" :
S
SDATA (helpObj);
/* Ignore invalid image specifications. */
if (!valid_image_p (image))
/* Ignore invalid image specifications. */
if (!valid_image_p (image))