Preliminary template save support in FLUID, plus some bug fixes.

fluid/Fl_Type.h:
    - Added read_image() declaration to Fl_Window_Type class.

fluid/Fl_Window_Type.cxx:
    - Added Overlay_Window::read_image() and
      Fl_Window_Type::read_image() functions.
    - Fl_Window_Type::fix_overlay(): update menu indices.
    - toggle_overlays(): update menu indices.

fluid/fluid.cxx:
    - save_template_cb(): Added to save to
      ~/.fltk/fltk.org/fluid/templates, along with PNG screenshot
      of first window.
    - "Save To" instead of "Save to".
    - Use fl_alert() for errors, not fl_message().
    - Add "File/Save Template..." and "File/Print..." (not yet
      implemented) menu items.
    - toggle_widgetbin_cb(): update menu indices.

fluid/undo.cxx:
    - Update menu item indices.
    - Don't need extra slash in undo checkpoint filename.

src/Fl_PNG_Image.cxx:
    - Fix typo in #endif comment.

src/Fl_Window.cxx:
    - Fl_Window::draw(): save/restore flags() when changing label.
    - Fl_Window::iconlabel(): save/restore flags() when changing label.

src/fl_rect.cxx:
    - fl_not_clipped(): don't use current window for gross clipping.





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

1 files changed, 7 insertions, 1 deletions

diff --git a/src/Fl_Window.cxx b/src/Fl_Window.cxx
index 414074138..f8fb10253 100644
--- a/src/Fl_Window.cxx
+++ b/src/Fl_Window.cxx
@@ -92,6 +92,7 @@ int Fl_Window::y_root() const {
 
 void Fl_Window::draw() {
   const char *savelabel = label();
+  uchar 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...
@@ -99,13 +100,18 @@ void Fl_Window::draw() {
   Fl_Group::draw();
   // Restore the label...
   Fl_Widget::label(savelabel);
+  set_flag(saveflags);
   y(savey);
   x(savex);
 }
 
 void Fl_Window::label(const char *name) {label(name, iconlabel());}
 
-void Fl_Window::iconlabel(const char *iname) {label(label(), iname);}
+void Fl_Window::iconlabel(const char *iname) {
+  uchar saveflags = flags();
+  label(label(), iname);
+  set_flag(saveflags);
+}
 
 // the Fl::atclose pointer is provided for back compatability.  You
 // can now just change the callback for the window instead.