diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-22 18:56:06 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-22 18:56:06 -0800 |
| commit | 51b59d794fe1d4a82fcd842b478657cc93f91595 (patch) | |
| tree | 25e57573403a13f3fe70934b40bf38c0190fd5ed /src/w32menu.c | |
| parent | 9e928ac989c824c376b1ab576a6da69cd86b12c6 (diff) | |
| download | emacs-51b59d794fe1d4a82fcd842b478657cc93f91595.tar.gz emacs-51b59d794fe1d4a82fcd842b478657cc93f91595.tar.bz2 emacs-51b59d794fe1d4a82fcd842b478657cc93f91595.zip | |
Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
Diffstat (limited to 'src/w32menu.c')
| -rw-r--r-- | src/w32menu.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/w32menu.c b/src/w32menu.c index 7f883e3de84..6c6a4edd167 100644 --- a/src/w32menu.c +++ b/src/w32menu.c @@ -527,7 +527,7 @@ set_frame_menubar (FRAME_PTR f, int first_time, int deep_p) string = AREF (items, i + 1); if (NILP (string)) break; - wv->name = (char *) SDATA (string); + wv->name = SSDATA (string); update_submenu_strings (wv->contents); wv = wv->next; } @@ -555,7 +555,7 @@ set_frame_menubar (FRAME_PTR f, int first_time, int deep_p) break; wv = xmalloc_widget_value (); - wv->name = (char *) SDATA (string); + wv->name = SSDATA (string); wv->value = 0; wv->enabled = 1; wv->button_type = BUTTON_TYPE_NONE; @@ -745,7 +745,7 @@ w32_menu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, } pane_string = (NILP (pane_name) - ? "" : (char *) SDATA (pane_name)); + ? "" : SSDATA (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) @@ -813,9 +813,9 @@ w32_menu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, prev_wv->next = wv; else save_wv->contents = wv; - wv->name = (char *) SDATA (item_name); + wv->name = SSDATA (item_name); if (!NILP (descrip)) - wv->key = (char *) SDATA (descrip); + wv->key = SSDATA (descrip); wv->value = 0; /* Use the contents index as call_data, since we are restricted to 16-bits. */ @@ -861,7 +861,7 @@ w32_menu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, else if (STRING_MULTIBYTE (title)) title = ENCODE_SYSTEM (title); - wv_title->name = (char *) SDATA (title); + wv_title->name = SSDATA (title); wv_title->enabled = TRUE; wv_title->title = TRUE; wv_title->button_type = BUTTON_TYPE_NONE; @@ -1021,7 +1021,7 @@ w32_dialog_show (FRAME_PTR f, int keymaps, pane_name = AREF (menu_items, MENU_ITEMS_PANE_NAME); prefix = AREF (menu_items, MENU_ITEMS_PANE_PREFIX); pane_string = (NILP (pane_name) - ? "" : (char *) SDATA (pane_name)); + ? "" : SSDATA (pane_name)); prev_wv = xmalloc_widget_value (); prev_wv->value = pane_string; if (keymaps && !NILP (prefix)) @@ -1069,8 +1069,8 @@ w32_dialog_show (FRAME_PTR f, int keymaps, prev_wv->next = wv; wv->name = (char *) button_names[nb_buttons]; if (!NILP (descrip)) - wv->key = (char *) SDATA (descrip); - wv->value = (char *) SDATA (item_name); + wv->key = SSDATA (descrip); + wv->value = SSDATA (item_name); wv->call_data = (void *) &AREF (menu_items, i); wv->enabled = !NILP (enable); wv->help = Qnil; @@ -1730,4 +1730,3 @@ globals_of_w32menu (void) unicode_append_menu = (AppendMenuW_Proc) GetProcAddress (user32, "AppendMenuW"); unicode_message_box = (MessageBoxW_Proc) GetProcAddress (user32, "MessageBoxW"); } - |