diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2010-10-28 18:02:20 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2010-10-28 18:02:20 +0000 |
| commit | 291faee430b13248a1b97e1ef254b9a468a67ad1 (patch) | |
| tree | ff6f7a61ff69000fe2b0c25b71d16bbc1ee2bb3a /src/Fl_Tile.cxx | |
| parent | 58bdfbdedd56582d4ed835018494dc21dc605f40 (diff) | |
Fixed a bunch of warnings from gcc 4.4.5 . Most of these are parenthesis missing to make the precedence of && over || obvious. Ah well, why not...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7765 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Tile.cxx')
| -rw-r--r-- | src/Fl_Tile.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Fl_Tile.cxx b/src/Fl_Tile.cxx index a211fd673..a747a93ed 100644 --- a/src/Fl_Tile.cxx +++ b/src/Fl_Tile.cxx @@ -52,17 +52,17 @@ void Fl_Tile::position(int oix, int oiy, int newx, int newy) { int R = X+o->w(); if (oix) { int t = p[0]; - if (t == oix || t>oix && X<newx || t<oix && X>newx) X = newx; + if (t == oix || (t>oix && X<newx) || (t<oix && X>newx) ) X = newx; t = p[1]; - if (t == oix || t>oix && R<newx || t<oix && R>newx) R = newx; + if (t == oix || (t>oix && R<newx) || (t<oix && R>newx) ) R = newx; } int Y = o->y(); int B = Y+o->h(); if (oiy) { int t = p[2]; - if (t == oiy || t>oiy && Y<newy || t<oiy && Y>newy) Y = newy; + if (t == oiy || (t>oiy && Y<newy) || (t<oiy && Y>newy) ) Y = newy; t = p[3]; - if (t == oiy || t>oiy && B<newy || t<oiy && B>newy) B = newy; + if (t == oiy || (t>oiy && B<newy) || (t<oiy && B>newy) ) B = newy; } o->damage_resize(X,Y,R-X,B-Y); } |