Commit 27ad7b52 authored by Jason Rumney's avatar Jason Rumney
Browse files

(set_frame_menubar, xmenu_show):

(xdialog_show):	Initialize wv->help to Qnil.
parent 0b1e6b54
......@@ -1645,6 +1645,7 @@ set_frame_menubar (f, first_time, deep_p)
wv->value = 0;
wv->enabled = 1;
wv->button_type = BUTTON_TYPE_NONE;
wv->help = Qnil;
first_wv = wv;
if (deep_p)
......@@ -1779,6 +1780,7 @@ set_frame_menubar (f, first_time, deep_p)
wv->value = 0;
wv->enabled = 1;
wv->button_type = BUTTON_TYPE_NONE;
wv->help = Qnil;
/* This prevents lwlib from assuming this
menu item is really supposed to be empty. */
/* The EMACS_INT cast avoids a warning.
......@@ -2002,6 +2004,7 @@ xmenu_show (f, x, y, for_click, keymaps, title, error)
wv->value = 0;
wv->enabled = 1;
wv->button_type = BUTTON_TYPE_NONE;
wv->help =Qnil;
first_wv = wv;
first_pane = 1;
......@@ -2070,6 +2073,7 @@ xmenu_show (f, x, y, for_click, keymaps, title, error)
wv->value = 0;
wv->enabled = 1;
wv->button_type = BUTTON_TYPE_NONE;
wv->help = Qnil;
save_wv = wv;
prev_wv = 0;
}
......@@ -2154,9 +2158,11 @@ xmenu_show (f, x, y, for_click, keymaps, title, error)
wv_sep2->name = "--";
wv_sep2->next = first_wv->contents;
wv_sep2->help = Qnil;
wv_sep1->name = "--";
wv_sep1->next = wv_sep2;
wv_sep1->help = Qnil;
#ifndef HAVE_MULTILINGUAL_MENU
if (STRING_MULTIBYTE (title))
......@@ -2167,6 +2173,7 @@ xmenu_show (f, x, y, for_click, keymaps, title, error)
wv_title->enabled = TRUE;
wv_title->button_type = BUTTON_TYPE_NONE;
wv_title->next = wv_sep1;
wv_title->help = Qnil;
first_wv->contents = wv_title;
}
......@@ -2370,6 +2377,7 @@ xdialog_show (f, keymaps, title, error)
prev_wv->name++;
prev_wv->enabled = 1;
prev_wv->name = "message";
prev_wv->help = Qnil;
first_wv = prev_wv;
/* Loop over all panes and items, filling in the tree. */
......@@ -2413,6 +2421,7 @@ xdialog_show (f, keymaps, title, error)
wv->value = (char *) XSTRING (item_name)->data;
wv->call_data = (void *) &XVECTOR (menu_items)->contents[i];
wv->enabled = !NILP (enable);
wv->help = Qnil;
prev_wv = wv;
if (! boundary_seen)
......@@ -2429,7 +2438,7 @@ xdialog_show (f, keymaps, title, error)
wv = xmalloc_widget_value ();
wv->name = dialog_name;
wv->help = Qnil;
/* Dialog boxes use a really stupid name encoding
which specifies how many buttons to use
and how many buttons are on the right.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment