summaryrefslogtreecommitdiff
path: root/src/Fl_Scroll.cxx
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2010-10-28 18:02:20 +0000
committerMatthias Melcher <fltk@matthiasm.com>2010-10-28 18:02:20 +0000
commit291faee430b13248a1b97e1ef254b9a468a67ad1 (patch)
treeff6f7a61ff69000fe2b0c25b71d16bbc1ee2bb3a /src/Fl_Scroll.cxx
parent58bdfbdedd56582d4ed835018494dc21dc605f40 (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_Scroll.cxx')
-rw-r--r--src/Fl_Scroll.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Fl_Scroll.cxx b/src/Fl_Scroll.cxx
index 0089524dd..d4a187301 100644
--- a/src/Fl_Scroll.cxx
+++ b/src/Fl_Scroll.cxx
@@ -348,9 +348,9 @@ void Fl_Scroll::resize(int X, int Y, int W, int H) {
o->position(o->x()+dx, o->y()+dy);
}
if (dw==0 && dh==0) {
- char pad = (scrollbar.visible() && hscrollbar.visible());
- char al = (scrollbar.align()&FL_ALIGN_LEFT!=0);
- char at = (scrollbar.align()&FL_ALIGN_TOP!=0);
+ char pad = ( scrollbar.visible() && hscrollbar.visible() );
+ char al = ( (scrollbar.align() & FL_ALIGN_LEFT) != 0 );
+ char at = ( (scrollbar.align() & FL_ALIGN_TOP) !=0 );
scrollbar.position(al?X:X+W-scrollbar.w(), (at&&pad)?Y+hscrollbar.h():Y);
hscrollbar.position((al&&pad)?X+scrollbar.w():X, at?Y:Y+H-hscrollbar.h());
} else {