From 6a7003164704a87872ae45d141736f3006dc39a3 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Sun, 28 Feb 2010 14:57:10 +0000 Subject: 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. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7176 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- CHANGES | 2 ++ src/Fl_Window.cxx | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 7c4ccacdf..a32ed03d6 100644 --- a/CHANGES +++ b/CHANGES @@ -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) diff --git a/src/Fl_Window.cxx b/src/Fl_Window.cxx index 692aa255e..a06ac29cd 100644 --- a/src/Fl_Window.cxx +++ b/src/Fl_Window.cxx @@ -156,9 +156,7 @@ void Fl_Window::copy_label(const char *a) { 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 -- cgit v1.2.3