Mercurial > emacs
annotate oldXMenu/ChgPane.c @ 109748:e2f8226efb99
Fix -Wwrite_strings in general and for Gtk+ specific code.
* callproc.c (synch_process_death): Make const.
(Fcall_process): Make signame const.
* emacs.c (main): Pass char[] to putenv instead of literal.
* floatfns.c (matherr): Use a const char* variable for x->name.
* font.c (font_open_by_name): Make name const.
* font.h (font_open_by_name): Make name const.
* gtkutil.c (get_utf8_string): Always return an allocated string.
Parameter is const.
(create_dialog, xg_create_one_menuitem, create_menus)
(xg_item_label_same_p, xg_update_menu_item): Free result from
get_utf8_string.
(xg_separator_p, xg_item_label_same_p): label is const.
* gtkutil.h: Replace widget_value with struct _widget_value.
(enum button_type, struct _widget_value): Remove and use the one from
keyboard.h.
* keyboard.h (_widget_value): Add defined USE_GTK. Replace Boolean
with unsigned char and XtPointer with void *.
* menu.c (Fx_popup_menu): error_name is const.
* menu.h (w32_menu_show, ns_menu_show, xmenu_show): error parameter
is const char **.
* w32menu.c (w32_menu_show):
* nsmenu.m (ns_menu_show): error parameter is const char **.
* process.h (synch_process_death): Is const char*.
* xmenu.c (Fx_popup_dialog): error_name is const char*.
(xmenu_show): error parameter is const char **. pane_string is const
char *.
(button_names): Is const char *.
(xdialog_show): error_name and pane_string is const.
* xrdb.c (get_system_app): Make path const and use char *p for non-const
char.
* xselect.c (Fx_get_atom_name): Use char empty[] instead of literal "".
* xsmfns.c (NOSPLASH_OPT): Change to char[].
(smc_save_yourself_CB): Do xstrdup on all ->type and ->name for
props. Free them at the end.
* xterm.c (emacs_class): New char[] for EMACS_CLASS.
(xim_open_dpy, xim_initialize, xim_close_dpy): Use emacs_class.
(x_term_init): Use char[] display_opt and name_opt instead of
string literal. file is const char*.
author | Jan D <jan.h.d@swipnet.se> |
---|---|
date | Wed, 11 Aug 2010 14:34:46 +0200 |
parents | 5cc91198ffb2 |
children | ef719132ddfa |
rev | line source |
---|---|
76174
fec5e03aaf59
Remove FSF copyright since file does not differ significantly from X11
Glenn Morris <rgm@gnu.org>
parents:
75348
diff
changeset
|
1 /* Copyright Massachusetts Institute of Technology 1985 */ |
fec5e03aaf59
Remove FSF copyright since file does not differ significantly from X11
Glenn Morris <rgm@gnu.org>
parents:
75348
diff
changeset
|
2 |
25858 | 3 #include "copyright.h" |
4 | |
5 | |
6 /* | |
7 * XMenu: MIT Project Athena, X Window system menu package | |
8 * | |
9 * XMenuChangePane - Change the label of a menu pane. | |
10 * | |
11 * Author: Tony Della Fera, DEC | |
12 * December 19, 1985 | |
13 * | |
14 */ | |
15 | |
77868
d4f6522bb9d2
Quiet --with-x-toolkit=no compilation warnings: #include <config.h>.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
76174
diff
changeset
|
16 #include <config.h> |
25858 | 17 #include "XMenuInt.h" |
18 | |
19 int | |
109124
5cc91198ffb2
Convert function definitions in oldXMenu to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
77868
diff
changeset
|
20 XMenuChangePane(register XMenu *menu, register int p_num, char *label) |
5cc91198ffb2
Convert function definitions in oldXMenu to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
77868
diff
changeset
|
21 /* Menu object to be modified. */ |
5cc91198ffb2
Convert function definitions in oldXMenu to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
77868
diff
changeset
|
22 /* Pane number to be modified. */ |
5cc91198ffb2
Convert function definitions in oldXMenu to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
77868
diff
changeset
|
23 /* Selection label. */ |
25858 | 24 { |
25 register XMPane *p_ptr; /* XMPane pointer. */ | |
26 | |
27 int label_length; /* Label length in characters. */ | |
28 int label_width; /* Label width in pixels. */ | |
29 | |
30 /* | |
31 * Check for NULL pointers! | |
32 */ | |
33 if (label == NULL) { | |
34 _XMErrorCode = XME_ARG_BOUNDS; | |
35 return(XM_FAILURE); | |
36 } | |
37 | |
38 /* | |
39 * Find the right pane. | |
40 */ | |
41 p_ptr = _XMGetPanePtr(menu, p_num); | |
42 if (p_ptr == NULL) return(XM_FAILURE); | |
43 | |
44 /* | |
45 * Determine label size. | |
46 */ | |
47 label_length = strlen(label); | |
48 label_width = XTextWidth(menu->p_fnt_info, label, label_length); | |
49 | |
50 /* | |
51 * Change the pane data. | |
52 */ | |
53 p_ptr->label = label; | |
54 p_ptr->label_width = label_width; | |
55 p_ptr->label_length = label_length; | |
56 | |
57 /* | |
58 * Schedule a recompute. | |
59 */ | |
60 menu->recompute = 1; | |
61 | |
62 /* | |
63 * Return the pane number just changed. | |
64 */ | |
65 _XMErrorCode = XME_NO_ERROR; | |
66 return(p_num); | |
67 } | |
52401 | 68 |
69 /* arch-tag: e267e9de-a3f0-4a0d-8c45-413afa176fd8 | |
70 (do not change this comment) */ |