Author: matt
Date: 2011-05-19 05:24:29 -0700 (Thu, 19 May 2011)
New Revision: 8691
Log:
123: fixed typo - not sure how that got in there, but we must be *extremely*
carful to translate literally, or we will get regressions!
Modified:
branches/branch-3.0/src/Fl.cxx
branches/branch-3.0/src/Fl_Clock.cxx
Modified: branches/branch-3.0/src/Fl.cxx
===================================================================
--- branches/branch-3.0/src/Fl.cxx 2011-05-19 06:37:02 UTC (rev 8690)
+++ branches/branch-3.0/src/Fl.cxx 2011-05-19 12:24:29 UTC (rev 8691)
@@ -1618,7 +1618,7 @@
Fl_X* i = Fl_X::i((fltk3::Window*)this);
if (!i) return; // window not mapped, so ignore it
if (i->region) {XDestroyRegion(i->region); i->region = 0;}
- fltk3::damage_ |= fl;
+ damage_ |= fl;
fltk3::damage(fltk3::DAMAGE_CHILD);
}
}
Modified: branches/branch-3.0/src/Fl_Clock.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Clock.cxx 2011-05-19 06:37:02 UTC (rev
8690)
+++ branches/branch-3.0/src/Fl_Clock.cxx 2011-05-19 12:24:29 UTC (rev
8691)
@@ -100,9 +100,9 @@
fltk3::push_matrix();
fltk3::color(active_r() ? fltk3::FOREGROUND_COLOR :
fltk3::inactive(fltk3::FOREGROUND_COLOR));
for (int i=0; i<12; i++) {
- if (i==6) rect(-0.5, 9, 1, 2);
- else if (i==3 || i==0 || i== 9) rect(-0.5, 9.5, 1, 1);
- else rect(-0.25, 9.5, .5, 1);
+ if (i==6) ::rect(-0.5, 9, 1, 2);
+ else if (i==3 || i==0 || i== 9) ::rect(-0.5, 9.5, 1, 1);
+ else ::rect(-0.25, 9.5, .5, 1);
fltk3::rotate(-30);
}
fltk3::pop_matrix();
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
