From d3402eaa855237617c4c20d358406168deb6b268 Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Tue, 26 Apr 2016 11:04:00 +0000 Subject: =?UTF-8?q?Remove=20compilation=20warnings:=20=20=20suggest=20pare?= =?UTF-8?q?ntheses=20around=20operand=20of=20=E2=80=98!=E2=80=99=20or=20ch?= =?UTF-8?q?ange=20=E2=80=98&=E2=80=99=20to=20=E2=80=98&&=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11701 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_Table.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Fl_Table.cxx b/src/Fl_Table.cxx index 48541fada..55e0a9f35 100644 --- a/src/Fl_Table.cxx +++ b/src/Fl_Table.cxx @@ -481,8 +481,8 @@ void Fl_Table::recalc_dimensions() { int hideh = (table_w <= tiw); int scrollsize = _scrollbar_size ? _scrollbar_size : Fl::scrollbar_size(); // Second pass: Check for interference - if ( !hideh & hidev ) { hidev = (( table_h - tih + scrollsize ) <= 0 ); } - if ( !hidev & hideh ) { hideh = (( table_w - tiw + scrollsize ) <= 0 ); } + if ( !hideh && hidev ) { hidev = (( table_h - tih + scrollsize ) <= 0 ); } + if ( !hidev && hideh ) { hideh = (( table_w - tiw + scrollsize ) <= 0 ); } // Determine scrollbar visibility, trim ti[xywh]/to[xywh] if ( hidev ) { vscrollbar->hide(); } else { vscrollbar->show(); tiw -= scrollsize; tow -= scrollsize; } -- cgit v1.2.3