~ubuntu-branches/ubuntu/trusty/xterm/trusty

Viewing changes to menu.c

Committer: Bazaar Package Importer
Author(s): Ryan Kavanagh
Date: 2008-11-23 17:15:10 UTC
mfrom: (1.1.10 upstream) (11.1.2 sid)
Revision ID: james.westby@ubuntu.com-20081123171510-fdwvfr4ytnfvjwjl

Tags: 237-1ubuntu1

* Merge from Debian unstable. Remaining Ubuntu changes:
  - Enabled URL hilighting
  - Maintainer field
  - rm -rf for .pc patches
* Closes (LP: #301451)

Show diffs side-by-side

added added

removed removed

/* $XTermId: menu.c,v 1.240 2008/01/20 15:16:43 tom Exp $ */

/* $XTermId: menu.c,v 1.241 2008/06/03 20:05:49 tom Exp $ */

2487

#if OPT_TOOLBAR

2488

Dimension button_height = 0;

2489

Dimension toolbar_hSpace;

2490

Dimension toolbar_border;

2491

2490

Arg args[10];

2492

2491

#endif

2493

2492

2533

2532

2534

2533

XtVaGetValues(*menus,

2535

2534

XtNhSpace, &toolbar_hSpace,

2536

XtNborderWidth, &toolbar_border,

2537

2535

(XtPointer) 0);

2538

2536

2539

2537

if (shell == toplevel) { /* vt100 */

2553

2551

* Tell the main program how high the toolbar is, to help with the initial

2554

2552

* layout.

2555

2553

2556

*menu_high = (button_height + 2 * (toolbar_hSpace + toolbar_border));

2557

TRACE(("...menuHeight:%d = (%d + 2 * (%d + %d))\n",

2558

*menu_high, button_height, toolbar_hSpace, toolbar_border));

2554

*menu_high = (button_height + 2 * (toolbar_hSpace));

2555

TRACE(("...menuHeight:%d = (%d + 2 * %d)\n",

2556

*menu_high, button_height, toolbar_hSpace));

2559

2557

2560

2558

#else /* !OPT_TOOLBAR */

2561

2559

*forms = shell;

Older »