summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2016-04-26 11:04:00 +0000
committerManolo Gouy <Manolo>2016-04-26 11:04:00 +0000
commitd3402eaa855237617c4c20d358406168deb6b268 (patch)
tree6e4555b106c92bb2b9552c8afbd7599a95ec2034
parentf428d0077d5cb7a7ec0b9b91e0d71be8c52fd4f5 (diff)
Remove compilation warnings: suggest parentheses around operand of ‘!’ or change ‘&’ to ‘&&’
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11701 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--src/Fl_Table.cxx4
1 files 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; }