Mercurial > emacs
annotate oldXMenu/AddPane.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 */ |
25858 | 2 |
76174
fec5e03aaf59
Remove FSF copyright since file does not differ significantly from X11
Glenn Morris <rgm@gnu.org>
parents:
75348
diff
changeset
|
3 #include "copyright.h" |
25858 | 4 |
5 /* | |
6 * XMenu: MIT Project Athena, X Window system menu package | |
7 * | |
8 * XMenuAddPane - Adds a pane to an XMenu object. | |
9 * | |
10 * Author: Tony Della Fera, DEC | |
11 * August, 1985 | |
12 * | |
13 */ | |
14 | |
15 #include <config.h> | |
16 #include "XMenuInt.h" | |
17 | |
18 int | |
109124
5cc91198ffb2
Convert function definitions in oldXMenu to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
76174
diff
changeset
|
19 XMenuAddPane(Display *display, register XMenu *menu, register char *label, int active) |
5cc91198ffb2
Convert function definitions in oldXMenu to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
76174
diff
changeset
|
20 |
5cc91198ffb2
Convert function definitions in oldXMenu to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
76174
diff
changeset
|
21 /* Menu object to be modified. */ |
5cc91198ffb2
Convert function definitions in oldXMenu to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
76174
diff
changeset
|
22 /* Selection label. */ |
5cc91198ffb2
Convert function definitions in oldXMenu to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
76174
diff
changeset
|
23 /* Make selection active? */ |
25858 | 24 { |
25 register XMPane *pane; /* Newly created pane. */ | |
26 register XMSelect *select; /* Initial selection for the new pane. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
25858
diff
changeset
|
27 |
25858 | 28 int label_length; /* Label length in characters. */ |
29 int label_width; /* Label width in pixels. */ | |
30 | |
31 /* | |
32 * Check for NULL pointers! | |
33 */ | |
34 if (label == NULL) { | |
35 _XMErrorCode = XME_ARG_BOUNDS; | |
36 return(XM_FAILURE); | |
37 } | |
38 | |
39 /* | |
40 * Calloc the XMPane structure and the initial XMSelect. | |
41 */ | |
42 pane = (XMPane *)calloc(1, sizeof(XMPane)); | |
43 if (pane == NULL) { | |
44 _XMErrorCode = XME_CALLOC; | |
45 return(XM_FAILURE); | |
46 } | |
47 select = (XMSelect *)calloc(1, sizeof(XMSelect)); | |
48 if (select == NULL) { | |
49 _XMErrorCode = XME_CALLOC; | |
50 return(XM_FAILURE); | |
51 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
25858
diff
changeset
|
52 |
25858 | 53 /* |
54 * Determine label size. | |
55 */ | |
56 label_length = strlen(label); | |
57 label_width = XTextWidth(menu->p_fnt_info, | |
58 label, | |
59 label_length); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
25858
diff
changeset
|
60 |
25858 | 61 /* |
62 * Set up the initial selection. | |
63 * Values not explicitly set are zeroed by calloc. | |
64 */ | |
65 select->next = select; | |
66 select->prev = select; | |
67 select->type = SL_HEADER; | |
68 select->serial = -1; | |
69 select->parent_p = pane; | |
70 | |
71 /* | |
72 * Fill the XMPane structure. | |
73 * X and Y position are set to 0 since a recompute will follow. | |
74 */ | |
75 pane->type = PANE; | |
76 pane->active = active; | |
77 pane->serial = -1; | |
78 pane->label = label; | |
79 pane->label_width = label_width; | |
80 pane->label_length = label_length; | |
81 pane->s_list = select; | |
82 | |
83 /* | |
84 * Insert the pane at the end of the pane list. | |
85 */ | |
86 emacs_insque(pane, menu->p_list->prev); | |
87 | |
88 /* | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
25858
diff
changeset
|
89 * Update the pane count. |
25858 | 90 */ |
91 menu->p_count++; | |
92 | |
93 /* | |
94 * Schedule a recompute. | |
95 */ | |
96 menu->recompute = 1; | |
97 | |
98 /* | |
99 * Return the pane number just added. | |
100 */ | |
101 _XMErrorCode = XME_NO_ERROR; | |
102 return((menu->p_count - 1)); | |
103 } | |
52401 | 104 |
105 /* arch-tag: 62a26021-f29d-48ba-96ef-3b6c4ebd6547 | |
106 (do not change this comment) */ |