Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
364cd450
Commit
364cd450
authored
Mar 22, 2001
by
Gerd Moellmann
Browse files
(update_frame_menubar, set_frame_menubar, xmenu_show):
Remove calls to x_set_menu_resources_from_menu_face.
parent
7dc17ed0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
6 deletions
+13
-6
src/ChangeLog
src/ChangeLog
+12
-0
src/xmenu.c
src/xmenu.c
+1
-6
No files found.
src/ChangeLog
View file @
364cd450
2001-03-22 Gerd Moellmann <gerd@gnu.org>
* xfaces.c (x_set_menu_resources_from_menu_face) [USE_X_TOOLKIT]:
Removed, together with subroutines.
(x_set_menu_face_resources) [USE_X_TOOLKIT]: New function.
(realize_basic_faces) [USE_X_TOOLKIT]: Call
x_set_menu_face_resources.
* dispextern.h (x_set_menu_resources_from_menu_face): Remove
prototype.
* xmenu.c (update_frame_menubar, set_frame_menubar, xmenu_show):
Remove calls to x_set_menu_resources_from_menu_face.
* xfaces.c (xm_set_menu_resources_from_menu_face): Remove
#ifndef LESSTIF_VERSION.
...
...
src/xmenu.c
View file @
364cd450
...
...
@@ -1583,7 +1583,6 @@ update_frame_menubar (f)
/* Re-manage the text-area widget, and then thrash the sizes. */
XtManageChild
(
x
->
edit_widget
);
x_set_menu_resources_from_menu_face
(
f
,
x
->
menubar_widget
);
lw_refigure_widget
(
x
->
column_widget
,
True
);
/* Force the pane widget to resize itself with the right values. */
...
...
@@ -1835,8 +1834,7 @@ set_frame_menubar (f, first_time, deep_p)
}
free_menubar_widget_value_tree
(
first_wv
);
if
(
!
update_frame_menubar
(
f
))
x_set_menu_resources_from_menu_face
(
f
,
menubar_widget
);
update_frame_menubar
(
f
);
UNBLOCK_INPUT
;
}
...
...
@@ -2176,9 +2174,6 @@ xmenu_show (f, x, y, for_click, keymaps, title, error)
/* Free the widget_value objects we used to specify the contents. */
free_menubar_widget_value_tree
(
first_wv
);
/* Override any default settings with ones from the `menu' face. */
x_set_menu_resources_from_menu_face
(
f
,
menu
);
/* No selection has been chosen yet. */
menu_item_selection
=
0
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment