Author: AlbrechtS
Date: 2010-02-28 06:57:10 -0800 (Sun, 28 Feb 2010)
New Revision: 7176
Log:
Removed saving the flags() in Fl_Window::iconlabel(const char *iname) because
this could result in wrong flags() contents after return. Fl_Widget::label()
(that is called internally) takes care of copied labels and sets the flags()
appropriately. See also STR #2161.
Modified:
branches/branch-1.3/CHANGES
branches/branch-1.3/src/Fl_Window.cxx
Modified: branches/branch-1.3/CHANGES
===================================================================
--- branches/branch-1.3/CHANGES 2010-02-28 14:25:54 UTC (rev 7175)
+++ branches/branch-1.3/CHANGES 2010-02-28 14:57:10 UTC (rev 7176)
@@ -1,5 +1,7 @@
CHANGES IN FLTK 1.3.0
+ - Fixed possibility of wrong flags() in Fl_Window::iconlabel()
+ (STR #2161)
- Fixed Scrollbar events when max is less than min (STR #2283)
- Added argument-less constructor in Fuid Widget Class
- Fixed menu item counting issue in Fluid (STR #2322)
Modified: branches/branch-1.3/src/Fl_Window.cxx
===================================================================
--- branches/branch-1.3/src/Fl_Window.cxx 2010-02-28 14:25:54 UTC (rev
7175)
+++ branches/branch-1.3/src/Fl_Window.cxx 2010-02-28 14:57:10 UTC (rev
7176)
@@ -156,9 +156,7 @@
void Fl_Window::iconlabel(const char *iname) {
- unsigned saveflags = flags();
label(label(), iname);
- set_flag(saveflags);
}
// the Fl::atclose pointer is provided for back compatibility. You
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
