Fixed Fl_Window::copy_label() losing copy (STR #1332)

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5251 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

CHANGES

@@ -1,5 +1,6 @@
 CHANGES IN FLTK 1.1.8
 
+	- Fixed Fl_Window::copy_label() losing copy (STR #1332)
 	- Documentation fixes (STR #1336, STR #1329, STR #1339,
 	  STR #1340)
 	- Added support for floating point Fl_Spinner in the

src/Fl_Window.cxx

@@ -100,10 +100,11 @@ int Fl_Window::y_root() const {
 
 void Fl_Window::draw() {
   const char *savelabel = label();
-  uchar saveflags = flags();
+  int saveflags = flags();
   int savex = x(); x(0);
   int savey = y(); y(0);
   // Make sure we don't draw the window title in the window background...
+  clear_flag(COPIED_LABEL); // do not free copied labels!
   Fl_Widget::label(0);
   Fl_Group::draw();
 #ifdef __APPLE_QUARTZ__
@@ -133,7 +134,9 @@ void Fl_Window::draw() {
   x(savex);
 }
 
-void Fl_Window::label(const char *name) {label(name, iconlabel());}
+void Fl_Window::label(const char *name) {
+  label(name, iconlabel());
+}
 
 void Fl_Window::copy_label(const char *a) {
   if (flags() & COPIED_LABEL) {

src/Fl_win32.cxx

@@ -1303,7 +1303,7 @@ Fl_X* Fl_X::make(Fl_Window* w) {
     Fl::e_number = old_event;
     w->redraw(); // force draw to happen
   }
-  // If we've captured the mouse, we dont want do activate any
+  // If we've captured the mouse, we dont want to activate any
   // other windows from the code, or we loose the capture.
   ShowWindow(x->xid, !showit ? SW_SHOWMINNOACTIVE :
 	     (Fl::grab() || (style & WS_POPUP)) ? SW_SHOWNOACTIVATE : SW_SHOWNORMAL);