aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2001-03-13 16:51:13 +0000
committerGerd Moellmann2001-03-13 16:51:13 +0000
commit667f102ab25eb0303a53355d7d89177319a4e30e (patch)
treefe54ed6fb4a36aa31ac9f115756a8a5330c273d3
parentf25d58a47c5b869b9325e9b411151e128537b14e (diff)
downloademacs-667f102ab25eb0303a53355d7d89177319a4e30e.tar.gz
emacs-667f102ab25eb0303a53355d7d89177319a4e30e.zip
(make_menu_in_widget): Remove code forcing LessTif to
recompute centered text; it works fine without with current LessTif.
-rw-r--r--lwlib/lwlib-Xm.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c
index 340c8fda784..9c8fbe50949 100644
--- a/lwlib/lwlib-Xm.c
+++ b/lwlib/lwlib-Xm.c
@@ -493,7 +493,8 @@ make_menu_in_widget (instance, widget, val, keep_first_children)
493 old_children = XtCompositeChildren (widget, &old_num_children); 493 old_children = XtCompositeChildren (widget, &old_num_children);
494 494
495 /* Allocate the children array */ 495 /* Allocate the children array */
496 for (num_children = 0, cur = val; cur; num_children++, cur = cur->next); 496 for (num_children = 0, cur = val; cur; num_children++, cur = cur->next)
497 ;
497 children = (Widget*)XtMalloc (num_children * sizeof (Widget)); 498 children = (Widget*)XtMalloc (num_children * sizeof (Widget));
498 499
499 /* WIDGET should be a RowColumn. */ 500 /* WIDGET should be a RowColumn. */
@@ -610,12 +611,6 @@ make_menu_in_widget (instance, widget, val, keep_first_children)
610 if (button) 611 if (button)
611 XtVaSetValues (widget, XmNmenuHelpWidget, button, NULL); 612 XtVaSetValues (widget, XmNmenuHelpWidget, button, NULL);
612 613
613 /* LessTif apparently doesn't recompute centered text when more
614 widgets are added. So, do it after all widgets have been
615 created. */
616 if (title)
617 XtVaSetValues (title, XmNalignment, XmALIGNMENT_CENTER, NULL);
618
619 if (num_children) 614 if (num_children)
620 XtManageChildren (children, num_children); 615 XtManageChildren (children, num_children);
621 616
@@ -1906,7 +1901,6 @@ xm_pop_down_callback (widget, closure, call_data)
1906 XtPointer call_data; 1901 XtPointer call_data;
1907{ 1902{
1908 widget_instance *instance = (widget_instance *) closure; 1903 widget_instance *instance = (widget_instance *) closure;
1909 fprintf (stderr, "%p\n", call_data);
1910 1904
1911 if ((!instance->pop_up_p && XtParent (widget) == instance->widget) 1905 if ((!instance->pop_up_p && XtParent (widget) == instance->widget)
1912 || XtParent (widget) == instance->parent) 1906 || XtParent (widget) == instance->parent)