VARCem/PDCurses
1
0
Fork 0
mirror of https://github.com/VARCem/PDCurses.git synced 2026-09-23 23:35:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change variable main to wmain

Browse Source 
Remove warnings
This commit is contained in:
Mark Hessling
2001-01-10 08:32:08 +00:00
parent 0148d7c564
commit 4ce3e19130
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
x11/ScrollBox.c
View File

@@ -121,15 +121,17 @@ Widget w;
Boolean doit;
{
ScrollBoxWidget sbw = (ScrollBoxWidget) w;
Widget main, vscroll, hscroll;
Widget wmain, vscroll, hscroll;
Widget child;
Dimension mw, mh; /* main window */
Dimension vh; /* vertical scrollbar length (height) */
Dimension hw; /* horizontal scrollbar length (width) */
Position vx;
Position hy;
#if 0
Dimension th;
Dimension tw;
#endif
int i;
if (sbw->composite.num_children != 3)
@@ -148,7 +150,7 @@ Boolean doit;
* Child one is the main window, two is the vertical scrollbar,
* and three is the horizontal scrollbar.
*/
main = sbw->composite.children[0];
wmain = sbw->composite.children[0];
vscroll = sbw->composite.children[1];
hscroll = sbw->composite.children[2];
@@ -158,36 +160,36 @@ Boolean doit;
#if 1
mw = sbw->core.width - (2 * sbw->scrollBox.h_space) -
vscroll->core.width - (2 * vscroll->core.border_width) -
(2 * main->core.border_width);
(2 * wmain->core.border_width);
mh = sbw->core.height - (2 * sbw->scrollBox.v_space) -
hscroll->core.height - (2 * hscroll->core.border_width) -
(2 * main->core.border_width);
(2 * wmain->core.border_width);
vx = main->core.x + mw + sbw->scrollBox.h_space + main->core.border_width + vscroll->core.border_width;
vx = wmain->core.x + mw + sbw->scrollBox.h_space + wmain->core.border_width + vscroll->core.border_width;
hy = main->core.y + mh + sbw->scrollBox.v_space + main->core.border_width + hscroll->core.border_width;
hy = wmain->core.y + mh + sbw->scrollBox.v_space + wmain->core.border_width + hscroll->core.border_width;
vh = mh; /* scrollbars are always same length as main window */
hw = mw;
if (doit) {
XtResizeWidget(main, mw, mh, 1);
XtResizeWidget(wmain, mw, mh, 1);
#else
tw = main->core.width + (2 * sbw->scrollBox.h_space) +
tw = wmain->core.width + (2 * sbw->scrollBox.h_space) +
vscroll->core.width + (2 * vscroll->core.border_width) +
(2 * main->core.border_width);
(2 * wmain->core.border_width);
th = main->core.height + (2 * sbw->scrollBox.v_space) +
th = wmain->core.height + (2 * sbw->scrollBox.v_space) +
hscroll->core.height - (2 * hscroll->core.border_width) +
(2 * main->core.border_width);
(2 * wmain->core.border_width);
hw = mw = main->core.width;
vh = mh = main->core.height;
hw = mw = wmain->core.width;
vh = mh = wmain->core.height;
vx = main->core.x + mw + sbw->scrollBox.h_space + main->core.border_width + vscroll->core.border_width;
vx = wmain->core.x + mw + sbw->scrollBox.h_space + wmain->core.border_width + vscroll->core.border_width;
hy = main->core.y + mh + sbw->scrollBox.v_space + main->core.border_width + hscroll->core.border_width;
hy = wmain->core.y + mh + sbw->scrollBox.v_space + wmain->core.border_width + hscroll->core.border_width;
if (doit) {
XtResizeWidget(w, tw, th, 1);